3.3.0 fix

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

@@ -1312,8 +1312,7 @@ public class CreatePdfUtil {
             }
         }
 
-        studentHtml = studentHtml.replaceAll("\\$\\{packageCodeImg\\}", "");
-        studentHtml = studentHtml.replaceAll("\\$\\{packageCode\\}", "");
+        studentHtml = studentHtml.replaceAll("\\$\\{packageCodeDom\\}", "");
 
         // 将其它未匹配到值的参数，填入空值
         studentHtml = studentHtml.replaceAll("^\\$\\{[A-Za-z0-9]+\\}$", "");
@@ -1466,8 +1465,8 @@ public class CreatePdfUtil {
         //通用题卡生成卷袋贴条码
         String packageCode = examDetail.getPackageCode() + sequence;
         String packageCodeImg = GoogleBarCodeUtil.createBarCode(packageCode, false);
-        cardTemp = cardTemp.replaceAll("\\$\\{packageCodeImg\\}", packageCodeImg);
-        cardTemp = cardTemp.replaceAll("\\$\\{packageCode\\}", packageCode);
+        cardTemp = cardTemp.replaceAll("\\$\\{packageCodeDom\\}", "<img src='"+"data:image/png;base64," + packageCodeImg+"'><p>"+packageCode+"</p>");
+//        cardTemp = cardTemp.replaceAll("\\$\\{packageCode\\}", packageCode);
         // 上传通卡
 //        if (cardTemp.contains("<div class=\"page-box page-box-0\">")) {
 //            String packageCodeDiv = "<div class=\"page-box page-box-0\"><div class=\"package-number\" style=\"position: absolute;width: 200px;height: 40px;top: 10px;right: 25%;margin-left: -100px;text-align: center;z-index: 99;\"><img src=\"data:image/png;base64," + packageCodeImg + "\" style=\"display: block; height: 28px; width: 100%\" /><p style=\"line-height: 1; font-size: 12px; margin: 0;\">" + packageCode + "</p></div>";

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkController.java

@@ -1,15 +1,6 @@
 package com.qmth.distributed.print.api.mark;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.teachcloud.mark.utils.TaskLock;
-import com.qmth.teachcloud.mark.utils.TaskLockUtil;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.service.SysUserService;
@@ -18,9 +9,19 @@ import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import com.qmth.teachcloud.mark.params.MarkResult;
 import com.qmth.teachcloud.mark.service.MarkService;
-
+import com.qmth.teachcloud.mark.utils.TaskLock;
+import com.qmth.teachcloud.mark.utils.TaskLockUtil;
 import io.lettuce.core.GeoArgs.Sort;
 import io.swagger.annotations.Api;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -42,10 +43,19 @@ public class MarkController {
 
     @PostMapping(value = "/")
     @Aac(auth = false)
-    public Object getTaskLock(@RequestParam Long examId, @RequestParam String paperNumber,
-                              @RequestParam Integer groupNumber) {
-        TaskLock taskLock = TaskLockUtil.getFormalTask(examId + "_" + paperNumber + "_" + groupNumber);
-        return taskLock.list();
+    public Object getTaskLock(@RequestParam(required = false) Long examId,
+                              @RequestParam(required = false) String paperNumber,
+                              @RequestParam(required = false) Integer groupNumber) {
+        Map<String, TaskLock> formalTaskMap = TaskLockUtil.getFormalTaskMap();
+        if (examId != null && StringUtils.isNotBlank(paperNumber) && groupNumber != null) {
+            TaskLock taskLock = TaskLockUtil.getFormalTask(examId + "_" + paperNumber + "_" + groupNumber);
+            return taskLock.list();
+        }
+        Map<String, List<Map<String, Object>>> map = new HashMap<>();
+        for (Map.Entry<String, TaskLock> entry : formalTaskMap.entrySet()) {
+            map.put(entry.getKey(), entry.getValue().list());
+        }
+        return map;
     }
 
     @RequestMapping(value = "/getSetting", method = RequestMethod.POST)

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/utils/TaskLockUtil.java

@@ -12,6 +12,10 @@ public class TaskLockUtil {
     private static final Map<String, TaskLock> omrTaskMap = new HashMap<>();
     private static final Map<String, TaskLock> inspectedStudentMap = new HashMap<>();
 
+    public static Map<String, TaskLock> getFormalTaskMap(){
+        return formalTaskMap;
+    }
+
 
     public static void clearTimeoutTask(long timeoutMinute) {
         for (TaskLock taskLock : omrTaskMap.values()) {