3.2.7 bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTaskSync.java

@@ -22,7 +22,6 @@ import java.util.Map;
  * <p>
  * 数据同步
  * </p>
- *
  */
 @TableName("exam_task_sync")
 public class ExamTaskSync implements Serializable {
@@ -75,7 +74,7 @@ public class ExamTaskSync implements Serializable {
     /**
      * 云阅卷考试ID
      */
-    @TableField("third_relate_id")
+    @TableField(value = "third_relate_id", updateStrategy = FieldStrategy.IGNORED)
     private Integer thirdRelateId;
     /**
      * 同步状态
@@ -104,7 +103,7 @@ public class ExamTaskSync implements Serializable {
     public ExamTaskSync() {
     }
 
-    public ExamTaskSync(Long schoolId, Long examId, String courseCode, String paperNumber, String paperType, String totalPaperType, String orgCode, Integer thirdRelateId, ExamTaskSyncStatusEnum syncStatus, Long syncUserId, Long syncStartTime, Long syncEndTime) {
+    public ExamTaskSync(Long schoolId, Long examId, String courseCode, String paperNumber, String paperType, String totalPaperType, String orgCode, Long thirdRelateId, ExamTaskSyncStatusEnum syncStatus, Long syncUserId, Long syncStartTime, Long syncEndTime) {
         this.id = SystemConstant.getDbUuid();
         this.schoolId = schoolId;
         this.examId = examId;
@@ -113,7 +112,7 @@ public class ExamTaskSync implements Serializable {
         this.paperType = paperType;
         this.totalPaperType = totalPaperType;
         this.orgCode = orgCode;
-        this.thirdRelateId = thirdRelateId;
+        this.thirdRelateId = thirdRelateId != null ? Math.toIntExact(thirdRelateId) : null;
         this.syncStatus = syncStatus;
         this.syncUserId = syncUserId;
         this.syncStartTime = syncStartTime;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/DataSyncServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.dto.ExamDetailCourseDto;
+import com.qmth.distributed.print.business.bean.dto.RelatePaperDto;
 import com.qmth.distributed.print.business.bean.dto.SyncExamStudentDto;
 import com.qmth.distributed.print.business.bean.dto.SyncExamTaskDto;
 import com.qmth.distributed.print.business.bean.marking.status.ExamPaperStructureStatus;
@@ -134,11 +135,17 @@ public class DataSyncServiceImpl implements DataSyncService {
 
                 // 前置方法已经校验过各课程下是否有学院代码
                 // 同步考试
-                thirdRelateId = saveExam(schoolId, objectId, orgCode, thirdRelateId, thirdRelateName, examTime);
+                String saveExamErrorMessage = null;
+                try {
+                    thirdRelateId = saveExam(schoolId, objectId, orgCode, thirdRelateId, thirdRelateName, examTime);
+                } catch (Exception e) {
+                    saveExamErrorMessage = e.getMessage();
+                }
 
                 Long examTaskId = Long.valueOf(syncExamTaskDto.getExamTaskId());
                 ExamTask examTask = examTaskService.getById(examTaskId);
 
+                Set<String> errorMsgSet = new HashSet<>();
                 for (String paperType : syncExamTaskDto.getPaperType().split(",")) {
                     ExamTaskSync examTaskSync = examTaskSyncService.getBySchoolIdAndOrgCodeAndPaperNumberAndPaperType(schoolId, examTask.getExamId(), orgCode, examTask.getPaperNumber(), paperType);
                     if (examTaskSync != null && ExamTaskSyncStatusEnum.STARTING.equals(examTaskSync.getSyncStatus())) {
@@ -146,9 +153,9 @@ public class DataSyncServiceImpl implements DataSyncService {
                     }
                     ExamTaskSyncStatusEnum syncStatus = ExamTaskSyncStatusEnum.STARTING;
                     if (examTaskSync == null) {
-                        examTaskSync = new ExamTaskSync(schoolId, examTask.getExamId(), examTask.getCourseCode(), examTask.getPaperNumber(), paperType, syncExamTaskDto.getPaperType(), orgCode, Math.toIntExact(thirdRelateId), syncStatus, sysUser.getId(), System.currentTimeMillis(), null);
+                        examTaskSync = new ExamTaskSync(schoolId, examTask.getExamId(), examTask.getCourseCode(), examTask.getPaperNumber(), paperType, syncExamTaskDto.getPaperType(), orgCode, thirdRelateId, syncStatus, sysUser.getId(), System.currentTimeMillis(), null);
                     } else {
-                        examTaskSync.setThirdRelateId(Math.toIntExact(thirdRelateId));
+                        examTaskSync.setThirdRelateId(thirdRelateId != null ? Math.toIntExact(thirdRelateId) : null);
                         examTaskSync.setSyncStatus(syncStatus);
                         examTaskSync.setSyncStartTime(System.currentTimeMillis());
                         examTaskSync.setSyncUserId(sysUser.getId());
@@ -159,6 +166,10 @@ public class DataSyncServiceImpl implements DataSyncService {
                     String errorMsg = null;
                     ExamTaskSyncStatusEnum taskSyncStatusEnum = null;
                     try {
+                        // 考试未创建成功，则抛出异常，把数据状态改为失败
+                        if (thirdRelateId == null && StringUtils.isNotBlank(saveExamErrorMessage)) {
+                            throw ExceptionResultEnum.ERROR.exception(saveExamErrorMessage);
+                        }
                         List<Long> printPlanIds = Arrays.asList(syncExamTaskDto.getPrintPlanIds().split(",")).stream().map(m -> Long.parseLong(m)).collect(Collectors.toList());
                         List<ExamDetailCourseDto> examDetailCourseList = examDetailCourseService.listByPrintPlanIdAndExamTaskId(printPlanIds, examTaskId, paperType);
                         // 同步考生
@@ -179,11 +190,11 @@ public class DataSyncServiceImpl implements DataSyncService {
                             saveStudent(schoolId, thirdRelateId, syncExamStudentDtoList);
                         }
 
-                        // 同步题卡
                         // 同步题卡(只上传当前卷型)
                         cardUpload(schoolId, thirdRelateId, examTask, paperType);
                     } catch (Exception e) {
                         errorMsg = e.getMessage();
+                        errorMsgSet.add(errorMsg);
                         taskSyncStatusEnum = ExamTaskSyncStatusEnum.FAIL;
                     } finally {
                         examTaskSync.setErrorMsg(errorMsg);
@@ -192,10 +203,9 @@ public class DataSyncServiceImpl implements DataSyncService {
                     }
                     examTaskSync.setSyncEndTime(System.currentTimeMillis());
                     examTaskSyncService.saveOrUpdate(examTaskSync);
-
-                    if (StringUtils.isNotBlank(errorMsg)) {
-                        throw ExceptionResultEnum.ERROR.exception(errorMsg);
-                    }
+                }
+                if (!CollectionUtils.isEmpty(errorMsgSet)) {
+                    throw ExceptionResultEnum.ERROR.exception(String.join("；", errorMsgSet));
                 }
                 // 任务结果
                 result = TaskResultEnum.SUCCESS;