bugfix

distributed-print/src/main/java/com/qmth/distributed/print/api/NotifyApiController.java

@@ -16,6 +16,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.GradeAnalyzePaperStatusEnum;
 import com.qmth.teachcloud.common.enums.TaskResultEnum;
+import com.qmth.teachcloud.common.enums.TaskStatusEnum;
 import com.qmth.teachcloud.common.util.*;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
@@ -99,7 +100,12 @@ public class NotifyApiController {
             if (Objects.isNull(gradeBatch.getNotifyTime()) ||
                     (Objects.nonNull(gradeBatch.getNotifyTime())
                             && gradeBatch.getNotifyTime().longValue() <= calculateNotifyResult.getTime().longValue())) {
-                gradeBatch.setStatus(Objects.nonNull(calculateNotifyResult.getStatus()) ? GradeAnalyzePaperStatusEnum.valueOf(calculateNotifyResult.getStatus()) : null);
+                TaskStatusEnum taskStatus = Objects.nonNull(calculateNotifyResult.getStatus()) ? TaskStatusEnum.valueOf(calculateNotifyResult.getStatus()) : null;
+                if (taskStatus == TaskStatusEnum.DATA_VALID || taskStatus == TaskStatusEnum.RUNNING) {
+                    gradeBatch.setStatus(GradeAnalyzePaperStatusEnum.CALCULATING);
+                } else if (taskStatus == TaskStatusEnum.FINISH) {
+                    gradeBatch.setStatus(GradeAnalyzePaperStatusEnum.FINISH_CALCULATE);
+                }
                 gradeBatch.setProgress(calculateNotifyResult.getProgress());
                 gradeBatch.setNotifyTime(System.currentTimeMillis());
                 gradeBatch.setResult(Objects.nonNull(calculateNotifyResult.getResult()) ? TaskResultEnum.valueOf(calculateNotifyResult.getResult()) : null);

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/CallPrintOpenApiServiceImpl.java

@@ -41,7 +41,8 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
 
     @Override
     public PaperConfig callPaperConfig(Long thirdExamId, String gradeCourseCode) throws IOException {
-        Long schoolId = SystemConstant.getHeadOrUserSchoolId();
+//        Long schoolId = SystemConstant.getHeadOrUserSchoolId();
+        Long schoolId = 2L;
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
         log.info("请求分布式印刷试卷配置");
         JSONObject printOpenParams = new JSONObject();
@@ -54,9 +55,9 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         PaperConfig paperConfig = new PaperConfig();
         if (Objects.nonNull(callResult)) {
             log.info("callResult:{}", JacksonUtil.parseJson(callResult));
-            Result result = JSON.parseObject(callResult,Result.class);
+            Result result = JSON.parseObject(callResult, Result.class);
             Object data = result.getData();
-            paperConfig = JSON.parseObject(JSON.toJSONString(data),PaperConfig.class);
+            paperConfig = JSON.parseObject(JSON.toJSONString(data), PaperConfig.class);
         }
         return paperConfig;
     }
@@ -76,9 +77,9 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         List<PaperDimension> paperDimensionList = new ArrayList<>();
         if (Objects.nonNull(callResult)) {
             log.info("callResult:{}", JacksonUtil.parseJson(callResult));
-            Result result = JSON.parseObject(callResult,Result.class);
+            Result result = JSON.parseObject(callResult, Result.class);
             Object data = result.getData();
-            paperDimensionList = JSON.parseArray(JSON.toJSONString(data),PaperDimension.class);
+            paperDimensionList = JSON.parseArray(JSON.toJSONString(data), PaperDimension.class);
         }
         return paperDimensionList;
     }
@@ -98,9 +99,9 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         List<PaperStructure> paperStructureList = new ArrayList<>();
         if (Objects.nonNull(callResult)) {
             log.info("callResult:{}", JacksonUtil.parseJson(callResult));
-            Result result = JSON.parseObject(callResult,Result.class);
+            Result result = JSON.parseObject(callResult, Result.class);
             Object data = result.getData();
-            paperStructureList = JSON.parseArray(JSON.toJSONString(data),PaperStructure.class);
+            paperStructureList = JSON.parseArray(JSON.toJSONString(data), PaperStructure.class);
         }
         return paperStructureList;
     }
@@ -120,9 +121,9 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         List<PaperEvaluation> paperEvaluationList = new ArrayList<>();
         if (Objects.nonNull(callResult)) {
             log.info("callResult:{}", JacksonUtil.parseJson(callResult));
-            Result result = JSON.parseObject(callResult,Result.class);
+            Result result = JSON.parseObject(callResult, Result.class);
             Object data = result.getData();
-            paperEvaluationList = JSON.parseArray(JSON.toJSONString(data),PaperEvaluation.class);
+            paperEvaluationList = JSON.parseArray(JSON.toJSONString(data), PaperEvaluation.class);
         }
         return paperEvaluationList;
     }
@@ -139,20 +140,20 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         List<ExamStudentScore> examStudentScoreList = new ArrayList<>();
         List<ExamStudentScore> examStudentScoreCell = new ArrayList<>();
         int pageNumber = 1;
-        do{
-            printOpenParams.put("pageNumber",pageNumber);
+        do {
+            printOpenParams.put("pageNumber", pageNumber);
             long timestamp = System.currentTimeMillis();
             String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, dictionaryConfig.printOpenDomain().getExamStudentScore(), timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
             String callResult = HttpUtil.postJson(dictionaryConfig.printOpenDomain().getHostUrl() + dictionaryConfig.printOpenDomain().getExamStudentScore(), JacksonUtil.parseJson(printOpenParams), accessToken, timestamp);
             if (Objects.nonNull(callResult)) {
                 log.info("callResult:{}", JacksonUtil.parseJson(callResult));
-                Result result = JSON.parseObject(callResult,Result.class);
+                Result result = JSON.parseObject(callResult, Result.class);
                 Object data = result.getData();
-                examStudentScoreCell = JSON.parseArray(JSON.toJSONString(data),ExamStudentScore.class);
+                examStudentScoreCell = JSON.parseArray(JSON.toJSONString(data), ExamStudentScore.class);
                 examStudentScoreList.addAll(examStudentScoreCell);
             }
-            pageNumber ++;
-        }while (examStudentScoreCell.size() > 0);
+            pageNumber++;
+        } while (examStudentScoreCell.size() > 0);
         return examStudentScoreList;
     }