第一次点开始分析计算不显示状态的bugfix

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

@@ -96,7 +96,7 @@ public class DataSyncReportServiceImpl implements DataSyncReportService {
                 boolean syncCourse = teachCloudReportTaskUtils.syncCourse(schoolId, String.valueOf(thirdExamId), courseCode, gradeBatchPaper.getPaperName(), gradeBatchPaper.getPaperType(), gradeBatchPaper.getTeachCollegeName(), gradeBatchPaper.getEnable());
                 if (syncCourse) {
                     // 删除enable=false的课程
-                    if(!gradeBatchPaper.getEnable()) {
+                    if (!gradeBatchPaper.getEnable()) {
                         gradeBatchPaperService.removeById(gradeBatchPaper.getId());
                     }
 
@@ -144,11 +144,6 @@ public class DataSyncReportServiceImpl implements DataSyncReportService {
             status = TaskStatusEnum.RUNNING;
             tbSyncTaskService.updateStatusAndResultById(tbSyncTask.getId(), null, status, null, null);
 
-            // 清空错误日志文件
-            UpdateWrapper<GradeBatch> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.lambda().set(GradeBatch::getReportFilePath, null).eq(GradeBatch::getId, gradeBatch.getId());
-            gradeBatchService.update(updateWrapper);
-
             QueryWrapper<GradeBatchPaper> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(GradeBatchPaper::getBatchId, gradeBatch.getId());
             List<GradeBatchPaper> gradeBatchPaperList = gradeBatchPaperService.list(queryWrapper);
@@ -159,6 +154,12 @@ public class DataSyncReportServiceImpl implements DataSyncReportService {
             List<String> courseCodes = gradeBatchPaperList.stream().map(m -> m.getPaperNumber() + m.getPaperType()).collect(Collectors.toList());
             Collections.sort(courseCodes);
             source = Base64Util.encode(ShaUtils.sha1(gradeBatch.getThirdExamId() + courseCodes.toString()));
+            UpdateWrapper<GradeBatch> gradeBatchUpdateWrapper = new UpdateWrapper<>();
+            if (source != null) {
+                gradeBatchUpdateWrapper.lambda().set(GradeBatch::getSource, source);
+            }
+            gradeBatchUpdateWrapper.lambda().set(GradeBatch::getReportFilePath, null).eq(GradeBatch::getId, gradeBatch.getId());
+            gradeBatchService.update(gradeBatchUpdateWrapper);
             teachCloudReportTaskUtils.startCalc(schoolId, gradeBatch.getThirdExamId(), courseCodes);
             // 任务结果
             result = TaskResultEnum.SUCCESS;
@@ -172,12 +173,6 @@ public class DataSyncReportServiceImpl implements DataSyncReportService {
             // 同步结束
             status = TaskStatusEnum.FINISH;
             tbSyncTaskService.updateStatusAndResultById(tbSyncTask.getId(), null, status, result, errorMessage);
-
-            if (source != null) {
-                UpdateWrapper<GradeBatch> updateWrapper = new UpdateWrapper<>();
-                updateWrapper.lambda().set(GradeBatch::getSource, source).eq(GradeBatch::getId, gradeBatch.getId());
-                gradeBatchService.update(updateWrapper);
-            }
         }
     }
 
@@ -206,7 +201,7 @@ public class DataSyncReportServiceImpl implements DataSyncReportService {
             status = TaskStatusEnum.FINISH;
             tbSyncTaskService.updateStatusAndResultById(tbSyncTask.getId(), null, status, result, errorMessage);
 
-            if(!gradeBatchPaper.getPublishStatus()) {
+            if (!gradeBatchPaper.getPublishStatus()) {
                 UpdateWrapper<GradeBatchPaper> updateWrapper = new UpdateWrapper<>();
                 updateWrapper.lambda().set(GradeBatchPaper::getPublishStatus, publish).eq(GradeBatchPaper::getId, gradeBatchPaper.getId());
                 gradeBatchPaperService.update(updateWrapper);

distributed-print/src/main/resources/application-dev.properties

@@ -160,8 +160,8 @@ sync.config.groupCountUrl=/api/exam/mark_group/count
 sync.config.groupDeleteUrl=/api/exam/mark_group/delete
 sync.config.markerSaveUrl=/api/exam/marker/save
 
-#com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
-#com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
+com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
+com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
 #com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/tc-dev-wl.lic
 
 sms.config.smsNormalCode=qmth