From 39f8fb5886475604b6a9b6d99afe53ec730a293b Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期四, 31 十月 2024 14:31:20 +0800
Subject: [PATCH] 修改题库推送接口
---
exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/TripartiteInterfaceServiceImpl.java | 62 ++++++++++++++++++------------
exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/ThBatchManagerServiceImpl.java | 7 ++-
exam-system/src/main/java/com/gkhy/exam/institutionalaccess/controller/TripartiteInterfaceController.java | 2
exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/TripartiteInterfaceService.java | 2
exam-system/src/main/resources/mapper/institutionaccess/ThBatchMapper.xml | 2
5 files changed, 45 insertions(+), 30 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/controller/TripartiteInterfaceController.java b/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/controller/TripartiteInterfaceController.java
index 88cc6e3..239a7b9 100644
--- a/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/controller/TripartiteInterfaceController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/controller/TripartiteInterfaceController.java
@@ -32,7 +32,7 @@
@PostMapping("/question/bank")
@RepeatedClick
public AjaxResult receiveQuestionBank(@RequestBody JSONObject jsonObject) throws Exception {
- return success(tripartiteInterfaceService.receiveQuestionBank(jsonObject));
+ return tripartiteInterfaceService.receiveQuestionBank(jsonObject);
}
@PostMapping("/course")
@RepeatedClick
diff --git a/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/TripartiteInterfaceService.java b/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/TripartiteInterfaceService.java
index 84c21bc..d520439 100644
--- a/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/TripartiteInterfaceService.java
+++ b/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/TripartiteInterfaceService.java
@@ -5,7 +5,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
public interface TripartiteInterfaceService {
- boolean receiveQuestionBank(JSONObject jsonObject) throws Exception;
+ AjaxResult receiveQuestionBank(JSONObject jsonObject) throws Exception;
AjaxResult receiveCourse(JSONObject jsonObject);
diff --git a/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/ThBatchManagerServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/ThBatchManagerServiceImpl.java
index be08ff3..c427679 100644
--- a/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/ThBatchManagerServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/ThBatchManagerServiceImpl.java
@@ -200,8 +200,11 @@
HashMap<String, String> map = new HashMap<>();
map.put("name",thStudent.getName());
map.put("platform",thStudent.getInstitutionName());
- sendMessageUtil.sendMessageCheck(phone,map);
- return AjaxResult.success();
+ Boolean b = sendMessageUtil.sendMessageCheck(phone, map);
+ if (b){
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
}
public String getObtainSuperiors(String code){
diff --git a/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/TripartiteInterfaceServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/TripartiteInterfaceServiceImpl.java
index 55b849e..e6d9fff 100644
--- a/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/TripartiteInterfaceServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/TripartiteInterfaceServiceImpl.java
@@ -69,36 +69,48 @@
private ThCertService certService;
@Override
- public boolean receiveQuestionBank(JSONObject jsonObject) throws Exception {
+ public AjaxResult receiveQuestionBank(JSONObject jsonObject) throws Exception {
InstitutionUser institutionUser = ThreeInContextHolder.getContext();
- ThQuestionBankReqDTO questionBankReqDTO = decryptData(jsonObject, new TypeReference<ThQuestionBankReqDTO>() {},"题库数据");
- if(questionBankReqDTO==null){
+ List<ThQuestionBankReqDTO> questionBankReqDTO = decryptData(jsonObject, new TypeReference<List<ThQuestionBankReqDTO>>() {},"题库数据");
+ if(CollectionUtils.isEmpty(questionBankReqDTO)){
throw new BusinessException(this.getClass(),ResultConstants.THREE_INSTITUTION_PARAMM_NULL,"题库数据不可为空");
}
- String valdateMessage=ValidatorUtils.validateFast(questionBankReqDTO);
- if(!StringUtils.isEmpty(valdateMessage)){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL,valdateMessage);
+ List<ThErrorDataRespDTO> errorDataRespDTOS = new ArrayList<>();
+ List<ThQuestionBankReqDTO> thQuestionBankReqDTOS = new ArrayList<>();
+ for (ThQuestionBankReqDTO thQuestionBankReqDTO : questionBankReqDTO) {
+ String valdateMessage=ValidatorUtils.validateFast(thQuestionBankReqDTO);
+ if(!StringUtils.isEmpty(valdateMessage)){
+// throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL,valdateMessage);
+ errorDataRespDTOS.add(new ThErrorDataRespDTO(thQuestionBankReqDTO.getUuid(),valdateMessage));
+ continue;
+ }
+ thQuestionBankReqDTOS.add(thQuestionBankReqDTO);
}
- //根据uuid查询数据
- ThQuestionBank qb = questionBankService.getQuestionInfoByUuid(questionBankReqDTO.getUuid());
- boolean i = true;
- if(qb == null){
- //新增
- qb = new ThQuestionBank();
- BeanUtils.copyProperties(questionBankReqDTO, qb);
- qb.setUuid(questionBankReqDTO.getUuid());
- qb.setInstitutionId(institutionUser.getId());
- qb.setInstitutionName(institutionUser.getInstitutionalName());
- qb.setCreateBy(institutionUser.getInstitutionalName());
- qb.setUpdateBy(institutionUser.getInstitutionalName());
- i = questionBankService.save(qb);
- }else {
- //修改
- BeanUtils.copyProperties(questionBankReqDTO, qb);
- qb.setUpdateBy(institutionUser.getInstitutionalName());
- i = questionBankService.updateById(qb);
+ List<ThQuestionBank> savethQuestionBanks = new ArrayList<>();
+ List<ThQuestionBank> updatethQuestionBanks = new ArrayList<>();
+ for (ThQuestionBankReqDTO thQuestionBankReqDTO : thQuestionBankReqDTOS) {
+ //根据uuid查询数据
+ ThQuestionBank qb = questionBankService.getQuestionInfoByUuid(thQuestionBankReqDTO.getUuid());
+ if(qb == null){
+ //新增
+ qb = new ThQuestionBank();
+ BeanUtils.copyProperties(thQuestionBankReqDTO, qb);
+ qb.setUuid(thQuestionBankReqDTO.getUuid());
+ qb.setInstitutionId(institutionUser.getId());
+ qb.setInstitutionName(institutionUser.getInstitutionalName());
+ qb.setCreateBy(institutionUser.getInstitutionalName());
+ qb.setUpdateBy(institutionUser.getInstitutionalName());
+ savethQuestionBanks.add(qb);
+ }else {
+ //修改
+ BeanUtils.copyProperties(thQuestionBankReqDTO, qb);
+ qb.setUpdateBy(institutionUser.getInstitutionalName());
+ updatethQuestionBanks.add(qb);
+ }
}
- return i;
+ questionBankService.saveBatch(savethQuestionBanks);
+ questionBankService.updateBatchById(updatethQuestionBanks);
+ return AjaxResult.success(errorDataRespDTOS);
}
@Transactional
diff --git a/exam-system/src/main/resources/mapper/institutionaccess/ThBatchMapper.xml b/exam-system/src/main/resources/mapper/institutionaccess/ThBatchMapper.xml
index a3ddd68..12cdacd 100644
--- a/exam-system/src/main/resources/mapper/institutionaccess/ThBatchMapper.xml
+++ b/exam-system/src/main/resources/mapper/institutionaccess/ThBatchMapper.xml
@@ -30,7 +30,7 @@
and subject_code like concat(#{query.subjectCode}, '%')
</if>
<if test="query.trainOrgName != null and query.trainOrgName != ''">
- and train_org_name = #{query.trainOrgName}, '%')
+ and train_org_name = #{query.trainOrgName}
</if>
<if test="query.startTime != null"><!-- 开始时间检索 -->
and date_format(actual_start_time,'%y-%m-%d') >= date_format(#{query.startTime},'%y-%m-%d')
--
Gitblit v1.9.2