Merge branch 'dev_v3.1.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v3.1.0

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

@@ -24,8 +24,6 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -92,7 +90,6 @@ public class DataSyncReportServiceImpl implements DataSyncReportService {
             QueryWrapper<GradeBatchPaper> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(GradeBatchPaper::getBatchId, gradeBatch.getId());
             List<GradeBatchPaper> gradeBatchPaperList = gradeBatchPaperService.list(queryWrapper);
-            List<String> courseCodeList = new ArrayList<>();
             for (GradeBatchPaper gradeBatchPaper : gradeBatchPaperList) {
                 String courseCode = gradeBatchPaper.getPaperNumber() + gradeBatchPaper.getPaperType();
                 boolean syncCourse = teachCloudReportTaskUtils.syncCourse(schoolId, String.valueOf(thirdExamId), courseCode, gradeBatchPaper.getPaperName(), gradeBatchPaper.getPaperType(), gradeBatchPaper.getTeachCollegeName(), gradeBatchPaper.getEnable());
@@ -107,14 +104,10 @@ public class DataSyncReportServiceImpl implements DataSyncReportService {
                     gradeBatchPaper.setGradeCourseCode(courseCode);
                     gradeBatchPaper.setStatus(count > 0 ? GradeAnalyzePaperStatusEnum.READY_TO_CALCULATE : GradeAnalyzePaperStatusEnum.SETTING_GRADE_PAPER_PARAM);
                     gradeBatchPaperService.updateById(gradeBatchPaper);
-                    courseCodeList.add(courseCode);
                 }
             }
 
             long batchCount = gradeBatchPaperList.stream().filter(m -> GradeAnalyzePaperStatusEnum.SETTING_GRADE_PAPER_PARAM.equals(m.getStatus())).count();
-            Collections.sort(courseCodeList);
-            String source = Base64Util.encode(ShaUtils.sha1(thirdExamId + courseCodeList.toString()));
-            gradeBatch.setSource(source);
             gradeBatch.setStatus(batchCount > 0 ? GradeAnalyzePaperStatusEnum.SETTING_GRADE_PAPER_PARAM : GradeAnalyzePaperStatusEnum.READY_TO_CALCULATE);
 
             // 任务结果

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

@@ -80,7 +80,7 @@ public class NotifyApiController {
             log.info("localSign:{}", localSign);
 
             if (!Objects.equals(localSign, sign)) {
-                throw ExceptionResultEnum.ERROR.exception("签名不匹配");
+                throw ExceptionResultEnum.ERROR.exception("回调签名不匹配");
             }
 
             CalculateNotifyResult calculateNotifyResult = JSONObject.toJavaObject(JSONObject.parseObject(decodeJson), CalculateNotifyResult.class);

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -2,7 +2,6 @@ package com.qmth.teachcloud.common.contant;
 
 import com.qmth.boot.core.uid.service.UidService;
 import com.qmth.teachcloud.common.annotation.DBVerify;
-import com.qmth.teachcloud.common.bean.params.BasicSemesterParams;
 import com.qmth.teachcloud.common.bean.result.DBVerifyResult;
 import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -10,7 +9,6 @@ import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.TFCustomTypeEnum;
 import com.qmth.teachcloud.common.util.Base64Util;
 import com.qmth.teachcloud.common.util.ServletUtil;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.cglib.beans.BeanMap;
 
 import java.io.*;
@@ -105,7 +103,7 @@ public class SystemConstant {
     public static final String REGULAR_EXPRESSION_OF_CODE_SECOND_DIMENSION = "[A-Z][1-9][0-9]*";
     public static final String SYS_USER = "sysUser";
     public static final String DATA_COUNT = "dataCount";
-    public static final List<Long> MENU_MANAGE = Arrays.asList(507L, 508L, 530L, 531L);
+    public static final List<Long> MENU_MANAGE = Arrays.asList(507L, 508L, 530L, 531L, 675L, 676L);
     public static final float PAPER_DEVIATION = 2;
     public static final String COMMA_OF_ENGLISH = ",";
     public static final String COMMA_OF_CHINESE = "，";