Merge branch 'dev_v3.2.1' into dev_v3.2.1_optimize

merge

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

@@ -137,9 +137,9 @@ public class DataSyncServiceImpl implements DataSyncService {
             updateWrapper.lambda().set(ExamPrintPlan::getSyncStatus, syncStatus).eq(ExamPrintPlan::getId, printPlanId);
             examPrintPlanService.update(updateWrapper);
             // 同步成功，发送短信
-            if (ExamPrintPlanSyncStatusEnum.FINISH.equals(syncStatus)) {
-                examPrintPlanService.sendNoticeUploadStructure(printPlanId, sysUser);
-            }
+//            if (ExamPrintPlanSyncStatusEnum.FINISH.equals(syncStatus)) {
+//                examPrintPlanService.sendNoticeUploadStructure(printPlanId, sysUser);
+//            }
         }
     }
 

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

@@ -1325,19 +1325,15 @@ public class PrintCommonServiceImpl implements PrintCommonService {
 
     @Override
     public String createCourseSequence(Long schoolId, String courseCode) {
-        String key = "courseCode-" + courseCode + schoolId;
-        String sequence = convertUtil.getIncre("", key, 1);
-        if ("1".equals(sequence)) {
-            QueryWrapper<ExamTask> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(ExamTask::getSchoolId, schoolId).eq(ExamTask::getCourseCode, courseCode);
-            List<ExamTask> examTasks = examTaskService.list(queryWrapper);
-            if (examTasks != null && examTasks.size() > 0) {
-                String maxSequence = examTasks.stream().max(Comparator.comparing(ExamTask::getSequence)).get().getSequence();
-                if (StringUtils.isNotBlank(maxSequence)) {
-                    String incMaxSequence = String.valueOf(Integer.parseInt(maxSequence) + 1);
-                    redisUtil.set(key, incMaxSequence);
-                    return incMaxSequence;
-                }
+        String sequence = "1";
+        QueryWrapper<ExamTask> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(ExamTask::getSchoolId, schoolId).eq(ExamTask::getCourseCode, courseCode);
+        List<ExamTask> examTasks = examTaskService.list(queryWrapper);
+        if (examTasks != null && examTasks.size() > 0) {
+            String maxSequence = examTasks.stream().max(Comparator.comparing(ExamTask::getSequence)).get().getSequence();
+            if (StringUtils.isNotBlank(maxSequence)) {
+                String incMaxSequence = String.valueOf(Integer.parseInt(maxSequence) + 1);
+                return incMaxSequence;
             }
         }
         return sequence;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -1244,6 +1244,8 @@ public class CreatePdfUtil {
                 }
             }*/
         // 生成学生考号条码并将图片转成base64
+        studentHtml = studentHtml.replaceAll("\\$\\{studentCodeBarcode\\}", examStudent != null && examStudent.getStudentCode() != null ? GoogleBarCodeUtil.createBarCode(examStudent.getStudentCode(), false) : "");
+        studentHtml = studentHtml.replaceAll("\\$\\{ticketNumberBarcode\\}", examStudent != null && examStudent.getTicketNumber() != null ? GoogleBarCodeUtil.createBarCode(examStudent.getTicketNumber(), false) : "");
         studentHtml = studentHtml.replaceAll("\\$\\{examNumber\\}", examStudent != null && examStudent.getTicketNumber() != null ? GoogleBarCodeUtil.createBarCode(examStudent.getTicketNumber(), false) : "");
         studentHtml = studentHtml.replaceAll("\\$\\{examNumberStr\\}", examStudent != null && examStudent.getTicketNumber() != null ? examStudent.getTicketNumber() : "");
         // 随机生成学生试卷条码并将图片转成base64