From 92ac1754c713d206ebdafa3da8ec817c1d1e120d Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期四, 16 一月 2025 16:39:09 +0800
Subject: [PATCH] 特种作业缴费版本
---
exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/TripartiteInterfaceServiceImpl.java | 386 +++++++++++++++++++++++++-----------------------------
1 files changed, 179 insertions(+), 207 deletions(-)
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 d7110c8..2a3bfcf 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,69 +69,75 @@
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
@Override
public AjaxResult receiveCourse(JSONObject jsonObject) {
InstitutionUser institutionUser = ThreeInContextHolder.getContext();
-
- String data = jsonObject.getString("data");
- if(StringUtils.isEmpty(data)){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
- }
//解密
- String decrypt = "";
- try {
- decrypt = AESUtils.decrypt(data);
- }catch (Exception e){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
- }
- List<ThCourseReqDTO> courseReqDTOList = new ArrayList<>();
+ List<ThCourseReqDTO> courseReqDTOList =
+ decryptData(jsonObject, new TypeReference<List<ThCourseReqDTO>>() {},"课程");
+// List<ThCourseReqDTO> courseReqDTOList = new ArrayList<>();
//反序列化
- try {
- courseReqDTOList = JSONObject.parseObject(decrypt, new TypeReference<List<ThCourseReqDTO>>() {});
-
- }catch (Exception e){
- logger.error("课程反序列化失败！");
- throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
-
- }
+// try {
+// courseReqDTOList = JSONObject.parseObject(decrypt, new TypeReference<List<ThCourseReqDTO>>() {});
+//
+// }catch (Exception e){
+// logger.error("课程反序列化失败！");
+// throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
+//
+// }
if(CollectionUtils.isEmpty(courseReqDTOList)){
throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_ERROR,"数据推送不可以为空");
}
- //暂时不限制不能超过1000条
+ //暂时限制不能超过1000条
+ if (courseReqDTOList.size() > 1000){
+ throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_ERROR,"数据推送数据量过大");
+ }
List<String> reqAllCourseIds = new ArrayList<>();
List<String> reqAllChapterIds = new ArrayList<>();
List<ThErrorDataRespDTO> errorDataRespDTOS = new ArrayList<>();
@@ -431,22 +437,22 @@
}
//数据插入
//课程插入
- List<List<ThCourse>> splitSaveCourseList = ListUtil.split(saveCourseList, 500);
+ List<List<ThCourse>> splitSaveCourseList = ListUtil.split(saveCourseList, 200);
for(List<ThCourse> courseList : splitSaveCourseList){
courseService.insertBatch(courseList);
}
//修改课程
- List<List<ThCourse>> splitUpdateCourseList = ListUtil.split(updateCourseList, 500);
+ List<List<ThCourse>> splitUpdateCourseList = ListUtil.split(updateCourseList, 200);
for(List<ThCourse> courseList : splitUpdateCourseList){
courseService.updateBatch(courseList);
}
//插入章节
- List<List<ThCourseChapter>> splitSaveChapterList = ListUtil.split(saveCourseChapterList, 500);
+ List<List<ThCourseChapter>> splitSaveChapterList = ListUtil.split(saveCourseChapterList, 200);
for(List<ThCourseChapter> chapterList : splitSaveChapterList){
courseChapterService.insertBatch(chapterList);
}
//修改章节
- List<List<ThCourseChapter>> splitUpdateChapterList = ListUtil.split(updateCourseChapterList, 500);
+ List<List<ThCourseChapter>> splitUpdateChapterList = ListUtil.split(updateCourseChapterList, 200);
for(List<ThCourseChapter> chapterList : splitUpdateChapterList){
courseChapterService.updateBatch(chapterList);
}
@@ -458,28 +464,25 @@
public AjaxResult receiveStudent(JSONObject jsonObject) {
InstitutionUser institutionUser = ThreeInContextHolder.getContext();
- String data = jsonObject.getString("data");
- if(StringUtils.isEmpty(data)){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
- }
//解密
- String decrypt = "";
- try {
- decrypt = AESUtils.decrypt(data);
- }catch (Exception e){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
- }
+ List<ThStudentReqDTO> studentReqDTOs =
+ decryptData(jsonObject, new TypeReference<List<ThStudentReqDTO>>() {},"学员");
+
//反序列化
- List<ThStudentReqDTO> studentReqDTOs = new ArrayList<>();
- try {
- studentReqDTOs = JSONObject.parseObject(decrypt, new TypeReference<List<ThStudentReqDTO>>() {});
- }catch (Exception e){
- logger.error("学员序列化失败！");
- throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
- }
+// List<ThStudentReqDTO> studentReqDTOs = new ArrayList<>();
+// try {
+// studentReqDTOs = JSONObject.parseObject(decrypt, new TypeReference<List<ThStudentReqDTO>>() {});
+// }catch (Exception e){
+// logger.error("学员序列化失败！");
+// throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
+// }
//参数校验
if(CollectionUtils.isEmpty(studentReqDTOs)){
throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL,"学生信息不可为空");
+ }
+ //限制数据量不超过1000条
+ if (studentReqDTOs.size() > 1000){
+ throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_ERROR,"数据推送数据量过大");
}
List<String> idcardList = new ArrayList<>();
@@ -553,7 +556,7 @@
List<ThStudentBatch> updateThStudentBatchList = new ArrayList<>();
for (ThStudentReqDTO studentReqDTO : saveStudentReqDTOList) {
//学生表中过滤
- List<ThStudent> collect = students.stream().filter(s -> s.getIdcard().equals(studentReqDTO.getIdcard())).collect(Collectors.toList());
+ List<ThStudent> collect = students.stream().filter(s -> s.getIdcard().equals(studentReqDTO.getIdcard()) && s.getInstitutionId().equals(institutionUser.getId()) ).collect(Collectors.toList());
if(collect.size() > 0){
ThStudent student = collect.get(0);
//修改
@@ -615,23 +618,23 @@
}
}
//学生表新增
- List<List<ThStudent>> splitSaveStudentList = ListUtil.split(saveSudentList, 500);
+ List<List<ThStudent>> splitSaveStudentList = ListUtil.split(saveSudentList, 200);
for (List<ThStudent> studentList : splitSaveStudentList) {
studentService.insertBatch(studentList);
}
//学生表更新
- List<List<ThStudent>> splitUpdateStudentList = ListUtil.split(updateStudentList, 500);
+ List<List<ThStudent>> splitUpdateStudentList = ListUtil.split(updateStudentList, 200);
for (List<ThStudent> studentList : splitUpdateStudentList) {
studentService.updateBatch(studentList);
}
//学生关联班级表
- List<List<ThStudentBatch>> splitSaveThStudentBatchList = ListUtil.split(saveThStudentBatchList, 500);
+ List<List<ThStudentBatch>> splitSaveThStudentBatchList = ListUtil.split(saveThStudentBatchList, 200);
for (List<ThStudentBatch> studentBatcheList : splitSaveThStudentBatchList) {
studentBatchService.insertBatch(studentBatcheList);
}
//学生关联班级表修改
- List<List<ThStudentBatch>> splitUpdateThStudentBatchList = ListUtil.split(updateThStudentBatchList, 500);
+ List<List<ThStudentBatch>> splitUpdateThStudentBatchList = ListUtil.split(updateThStudentBatchList, 200);
for (List<ThStudentBatch> studentBatcheList : splitUpdateThStudentBatchList) {
studentBatchService.updateBatch(studentBatcheList);
}
@@ -648,29 +651,24 @@
public AjaxResult receiveBatch(JSONObject jsonObject) {
InstitutionUser institutionUser = ThreeInContextHolder.getContext();
- String data = jsonObject.getString("data");
- if(StringUtils.isEmpty(data)){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
- }
//解密
- String decrypt = "";
- try {
- decrypt = AESUtils.decrypt(data);
- }catch (Exception e){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
- }
+ List<ThBatchReqDTO> batchReqDTOList = decryptData(jsonObject, new TypeReference<List<ThBatchReqDTO>>() {},"班级");
//反序列化
- List<ThBatchReqDTO> batchReqDTOList = new ArrayList<>();
- try {
- batchReqDTOList = JSONObject.parseObject(decrypt, new TypeReference<List<ThBatchReqDTO>>() {});
-
- }catch (Exception e){
- logger.error("班级序列化失败！");
- throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
-
- }
+// List<ThBatchReqDTO> batchReqDTOList = new ArrayList<>();
+// try {
+// batchReqDTOList = JSONObject.parseObject(decrypt, new TypeReference<List<ThBatchReqDTO>>() {});
+//
+// }catch (Exception e){
+// logger.error("班级序列化失败！");
+// throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
+//
+// }
if(CollectionUtils.isEmpty(batchReqDTOList)){
throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL,"批次（班级）集合不可为空");
+ }
+ //限制数据量不超过1000条
+ if (batchReqDTOList.size() > 1000){
+ throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_ERROR,"数据推送数据量过大");
}
//过滤出本次请求所有班级课程章节
List<String> reqAllBatchUuids = new ArrayList<>();
@@ -1243,12 +1241,12 @@
}
//插入章节
- List<List<ThBatchCourseChapter>> splitSaveBatchCourseChapterList = ListUtil.split(saveBatchCourseChapterList, 500);
+ List<List<ThBatchCourseChapter>> splitSaveBatchCourseChapterList = ListUtil.split(saveBatchCourseChapterList, 200);
for (List<ThBatchCourseChapter> chapterList : splitSaveBatchCourseChapterList) {
batchCourseChapterService.insertBatch(chapterList);
}
//修改章节
- List<List<ThBatchCourseChapter>> splitUpdateBatchCourseChapterList = ListUtil.split(updateBatchCourseChapterList, 500);
+ List<List<ThBatchCourseChapter>> splitUpdateBatchCourseChapterList = ListUtil.split(updateBatchCourseChapterList, 200);
for (List<ThBatchCourseChapter> chapterList : splitUpdateBatchCourseChapterList) {
batchCourseChapterService.updateBatch(chapterList);
}
@@ -1261,28 +1259,23 @@
public AjaxResult receiveStudyDetail(JSONObject jsonObject) {
InstitutionUser institutionUser = ThreeInContextHolder.getContext();
- String data = jsonObject.getString("data");
- if(StringUtils.isEmpty(data)){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
- }
//解密
- String decrypt = "";
- try {
- decrypt = AESUtils.decrypt(data);
- }catch (Exception e){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
- }
+ List<ThStudyDetailReqDTO> thStudyDetailReqDTOS = decryptData(jsonObject, new TypeReference<List<ThStudyDetailReqDTO>>() {},"学习记录");
//反序列化
- List<ThStudyDetailReqDTO> thStudyDetailReqDTOS = new ArrayList<>();
- try {
- thStudyDetailReqDTOS = JSONObject.parseObject(decrypt, new TypeReference<List<ThStudyDetailReqDTO>>() {});
- }catch (Exception e){
- logger.error("学习记录序列化失败！");
- throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
- }
+// List<ThStudyDetailReqDTO> thStudyDetailReqDTOS = new ArrayList<>();
+// try {
+// thStudyDetailReqDTOS = JSONObject.parseObject(decrypt, new TypeReference<List<ThStudyDetailReqDTO>>() {});
+// }catch (Exception e){
+// logger.error("学习记录序列化失败！");
+// throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
+// }
//参数校验
if(CollectionUtils.isEmpty(thStudyDetailReqDTOS)){
throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL,"学习记录清单不可为空");
+ }
+ //限制数据量不超过1000条
+ if (thStudyDetailReqDTOS.size() > 1000){
+ throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_ERROR,"数据推送数据量过大");
}
//获取班级学生以及章节
List<String> chapterUuids = new ArrayList<>();
@@ -1370,20 +1363,20 @@
errorDataRespDTOS.add(new ThErrorDataRespDTO(studentDetailReqDTO.getUuid(),"结束位置不可为空"));
continue;
}
- if(StringUtils.isEmpty(studentDetailReqDTO.getLessonReportUrl())){
- errorDataRespDTOS.add(new ThErrorDataRespDTO(studentDetailReqDTO.getUuid(),"学时报告不可为空"));
- continue;
- }
+// if(StringUtils.isEmpty(studentDetailReqDTO.getLessonReportUrl())){
+// errorDataRespDTOS.add(new ThErrorDataRespDTO(studentDetailReqDTO.getUuid(),"学时报告不可为空"));
+// continue;
+// }
//认证记录集合
// if(CollectionUtils.isEmpty(studentDetailReqDTO.getAuthList())){
// errorDataRespDTOS.add(new ThErrorDataRespDTO(studentDetailReqDTO.getUuid(),"认证记录集合不可为空"));
// continue;
// }
//学习轨迹集合
- if(CollectionUtils.isEmpty(studentDetailReqDTO.getTrackList())){
- errorDataRespDTOS.add(new ThErrorDataRespDTO(studentDetailReqDTO.getUuid(),"学习轨迹集合不可为空"));
- continue;
- }
+// if(CollectionUtils.isEmpty(studentDetailReqDTO.getTrackList())){
+// errorDataRespDTOS.add(new ThErrorDataRespDTO(studentDetailReqDTO.getUuid(),"学习轨迹集合不可为空"));
+// continue;
+// }
/*boolean authFlag = false;
for(ThStudytAuthReqDTO item : studentDetailReqDTO.getAuthList()){
@@ -1416,32 +1409,32 @@
if(authFlag){
continue;
}*/
- boolean trackFlag = false;
- for(ThStudyTrackReqDTO item : studentDetailReqDTO.getTrackList()){
- if(StringUtils.isEmpty(item.getUuid()) || !UUID.checkIsUuid(item.getUuid())){
- trackFlag = true;
- errorDataRespDTOS.add(new ThErrorDataRespDTO(studentDetailReqDTO.getUuid(),"学习轨迹uuid（"+item.getUuid()+"）不符合规范"));
- break;
- }
- if(item.getStartTime() == null){
- trackFlag = true;
- errorDataRespDTOS.add(new ThErrorDataRespDTO(studentDetailReqDTO.getUuid(),"学习轨迹uuid（"+item.getUuid()+"）,轨迹开始时间不可为空"));
- break;
- }
- if(item.getEndTime() == null){
- trackFlag = true;
- errorDataRespDTOS.add(new ThErrorDataRespDTO(studentDetailReqDTO.getUuid(),"学习轨迹uuid（"+item.getUuid()+"）,轨迹结束时间不可为空"));
- break;
- }
- if(item.getTimeInterval() == null) {
- trackFlag = true;
- errorDataRespDTOS.add(new ThErrorDataRespDTO(studentDetailReqDTO.getUuid(),"学习轨迹uuid（"+item.getUuid()+"）,时间间隔（秒）不可为空"));
- break;
- }
- }
- if(trackFlag){
- continue;
- }
+// boolean trackFlag = false;
+// for(ThStudyTrackReqDTO item : studentDetailReqDTO.getTrackList()){
+// if(StringUtils.isEmpty(item.getUuid()) || !UUID.checkIsUuid(item.getUuid())){
+// trackFlag = true;
+// errorDataRespDTOS.add(new ThErrorDataRespDTO(studentDetailReqDTO.getUuid(),"学习轨迹uuid（"+item.getUuid()+"）不符合规范"));
+// break;
+// }
+// if(item.getStartTime() == null){
+// trackFlag = true;
+// errorDataRespDTOS.add(new ThErrorDataRespDTO(studentDetailReqDTO.getUuid(),"学习轨迹uuid（"+item.getUuid()+"）,轨迹开始时间不可为空"));
+// break;
+// }
+// if(item.getEndTime() == null){
+// trackFlag = true;
+// errorDataRespDTOS.add(new ThErrorDataRespDTO(studentDetailReqDTO.getUuid(),"学习轨迹uuid（"+item.getUuid()+"）,轨迹结束时间不可为空"));
+// break;
+// }
+// if(item.getTimeInterval() == null) {
+// trackFlag = true;
+// errorDataRespDTOS.add(new ThErrorDataRespDTO(studentDetailReqDTO.getUuid(),"学习轨迹uuid（"+item.getUuid()+"）,时间间隔（秒）不可为空"));
+// break;
+// }
+// }
+// if(trackFlag){
+// continue;
+// }
saveStudyDetailReqDTOS.add(studentDetailReqDTO);
//判断需要修改的批次学生
@@ -1538,27 +1531,27 @@
}
}
//插入学习记录
- List<List<ThStudyDetail>> splitSaveDetailList = ListUtil.split(saveStudyDetailList, 500);
+ List<List<ThStudyDetail>> splitSaveDetailList = ListUtil.split(saveStudyDetailList, 200);
for (List<ThStudyDetail> thStudyDetails : splitSaveDetailList) {
studyDetailService.insertBatch(thStudyDetails);
}
//修改学习记录
- List<List<ThStudyDetail>> splitUpdateDetailList = ListUtil.split(updateStudyDetailList, 500);
+ List<List<ThStudyDetail>> splitUpdateDetailList = ListUtil.split(updateStudyDetailList, 200);
for (List<ThStudyDetail> thStudyDetails : splitUpdateDetailList) {
studyDetailService.updateBatch(thStudyDetails);
}
//插入认证记录
- List<List<ThStudyAuth>> splitSaveAuthList = ListUtil.split(saveStudyAuthList, 500);
+ List<List<ThStudyAuth>> splitSaveAuthList = ListUtil.split(saveStudyAuthList, 200);
for (List<ThStudyAuth> thStudyAuths : splitSaveAuthList) {
studyAuthService.insetBatch(thStudyAuths);
}
//插入学习轨迹
- List<List<ThStudyTrack>> splitSaveTrackList = ListUtil.split(saveStudyTrackList, 500);
+ List<List<ThStudyTrack>> splitSaveTrackList = ListUtil.split(saveStudyTrackList, 200);
for (List<ThStudyTrack> thStudyTracks : splitSaveTrackList) {
studyTrackService.insertBatch(thStudyTracks);
}
//修改学生完成状态
- List<List<ThStudentBatch>> splitUpdateThStudentBatchList = ListUtil.split(updateStudentBatchList, 500);
+ List<List<ThStudentBatch>> splitUpdateThStudentBatchList = ListUtil.split(updateStudentBatchList, 200);
for (List<ThStudentBatch> studentBatcheList : splitUpdateThStudentBatchList) {
studentBatchService.updateBatch(studentBatcheList);
}
@@ -1570,27 +1563,22 @@
public AjaxResult receiveExamRecord(JSONObject jsonObject) {
InstitutionUser institutionUser = ThreeInContextHolder.getContext();
- String data = jsonObject.getString("data");
- if(StringUtils.isEmpty(data)){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
- }
//解密
- String decrypt = "";
- try {
- decrypt = AESUtils.decrypt(data);
- }catch (Exception e){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
- }
+ List<ThExamRecordReqDTO> examRecordReqDTOS = decryptData(jsonObject, new TypeReference<List<ThExamRecordReqDTO>>() {},"考试记录");
//反序列化
- List<ThExamRecordReqDTO> examRecordReqDTOS = new ArrayList<>();
- try {
- examRecordReqDTOS = JSONObject.parseObject(decrypt, new TypeReference<List<ThExamRecordReqDTO>>() {});
- }catch (Exception e){
- logger.error("考试记录序列化失败！");
- throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
- }
+// List<ThExamRecordReqDTO> examRecordReqDTOS = new ArrayList<>();
+// try {
+// examRecordReqDTOS = JSONObject.parseObject(decrypt, new TypeReference<List<ThExamRecordReqDTO>>() {});
+// }catch (Exception e){
+// logger.error("考试记录序列化失败！");
+// throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
+// }
if (CollectionUtils.isEmpty(examRecordReqDTOS)) {
throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL,"考试记录不可为空");
+ }
+ //限制数据量不超过1000条
+ if (examRecordReqDTOS.size() > 1000){
+ throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_ERROR,"数据推送数据量过大");
}
List<String> idcards = new ArrayList<>();
//List<String> batchUuids = new ArrayList<>();
@@ -1692,28 +1680,19 @@
public AjaxResult receiveCourseDelete(JSONObject jsonObject) {
InstitutionUser institutionUser = ThreeInContextHolder.getContext();
- String data = jsonObject.getString("data");
- if(StringUtils.isEmpty(data)){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
- }
//解密
- String decrypt = "";
- try {
- decrypt = AESUtils.decrypt(data);
- }catch (Exception e){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
- }
+ ThCourseDeleteReqDTO thCourseDeleteReqDTO = decryptData(jsonObject, new TypeReference<ThCourseDeleteReqDTO>() {},"课程删除");
//反序列化
- ThCourseDeleteReqDTO thCourseDeleteReqDTO = null;
- try {
- thCourseDeleteReqDTO = JSONObject.parseObject(decrypt, new TypeReference<ThCourseDeleteReqDTO>() {});
-
- }catch (Exception e){
- logger.error("课程删除反序列化失败！");
- throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
-
- }
+// ThCourseDeleteReqDTO thCourseDeleteReqDTO = null;
+// try {
+// thCourseDeleteReqDTO = JSONObject.parseObject(decrypt, new TypeReference<ThCourseDeleteReqDTO>() {});
+//
+// }catch (Exception e){
+// logger.error("课程删除反序列化失败！");
+// throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
+//
+// }
if(thCourseDeleteReqDTO == null){
throw new BusinessException(ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
}
@@ -1752,25 +1731,15 @@
public AjaxResult receiveBatchOpen(JSONObject jsonObject) {
InstitutionUser institutionUser = ThreeInContextHolder.getContext();
- String data = jsonObject.getString("data");
- if(StringUtils.isEmpty(data)){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
- }
- //解密
- String decrypt = "";
- try {
- decrypt = AESUtils.decrypt(data);
- }catch (Exception e){
- throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
- }
+ ThBatchOpenReqDTO thBatchOpenReqDTO = decryptData(jsonObject, new TypeReference<ThBatchOpenReqDTO>() {},"班级开始");
//反序列化
- ThBatchOpenReqDTO thBatchOpenReqDTO = null;
- try {
- thBatchOpenReqDTO = JSONObject.parseObject(decrypt, new TypeReference<ThBatchOpenReqDTO>() {});
- }catch (Exception e){
- logger.error("班级开始反序列化失败！");
- throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
- }
+// ThBatchOpenReqDTO thBatchOpenReqDTO = null;
+// try {
+// thBatchOpenReqDTO = JSONObject.parseObject(decrypt, new TypeReference<ThBatchOpenReqDTO>() {});
+// }catch (Exception e){
+// logger.error("班级开始反序列化失败！");
+// throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
+// }
if(thBatchOpenReqDTO == null){
throw new BusinessException(this.getClass(),ResultConstants.THREE_INSTITUTION_PARAMM_NULL,"批次（班级）不可为空");
}
@@ -1795,7 +1764,7 @@
@Override
public AjaxResult receiveBatchEnd(JSONObject jsonObject) {
InstitutionUser institutionUser = ThreeInContextHolder.getContext();
- ThBatchEndReqDTO thBatchEndReqDTO = decryptData(jsonObject, new TypeReference<ThBatchEndReqDTO>() {});
+ ThBatchEndReqDTO thBatchEndReqDTO = decryptData(jsonObject, new TypeReference<ThBatchEndReqDTO>() {},"批次(班级)");
if(thBatchEndReqDTO == null){
throw new BusinessException(this.getClass(),ResultConstants.THREE_INSTITUTION_PARAMM_NULL,"批次（班级）不可为空");
}
@@ -1818,7 +1787,7 @@
@Override
public AjaxResult receiveCerts(JSONObject jsonObject) throws Exception {
InstitutionUser institutionUser = ThreeInContextHolder.getContext();
- List<ThCertReqDTO> thCertReqDTOs = decryptData(jsonObject, new TypeReference<List<ThCertReqDTO>>() {});
+ List<ThCertReqDTO> thCertReqDTOs = decryptData(jsonObject, new TypeReference<List<ThCertReqDTO>>() {},"学时证书");
if(thCertReqDTOs.isEmpty() ||thCertReqDTOs.size()>50){
throw new BusinessException(this.getClass(), ResultConstants.RECORD_OVER_MAX);
}
@@ -1852,6 +1821,9 @@
cert.setUpdateTime(LocalDateTime.now());
cert.setInstitutionId(institutionUser.getId());
cert.setInstitutionName(institutionUser.getInstitutionalName());
+ if (cert.getDelFlag()==null) {
+ cert.setDelFlag(DeleteStatusEnum.NO.getStatus());
+ }
updateCertList.add(cert);
} else {
//新增
@@ -1886,7 +1858,7 @@
* @return
* @param <T>
*/
- private <T> T decryptData(JSONObject jsonObject,TypeReference<T> typeReference){
+ private <T> T decryptData(JSONObject jsonObject,TypeReference<T> typeReference,String type){
String data = jsonObject.getString("data");
if(StringUtils.isEmpty(data)){
throw new BusinessException(this.getClass(), ResultConstants.THREE_INSTITUTION_PARAMM_NULL);
@@ -1901,7 +1873,7 @@
try {
return JSONObject.parseObject(decrypt,typeReference);
}catch (Exception e){
- logger.error("学时证书反序列化失败！");
+ logger.error("{}反序列化失败！",type);
throw new BusinessException(this.getClass(), ResultConstants.SERIALIZE_ERROR);
}
}
--
Gitblit v1.9.2