Merge remote-tracking branch 'origin/dev_v2.2.0' into dev_v2.2.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncCreatePdfTempleteService.java

@@ -90,6 +90,7 @@ public class AsyncCreatePdfTempleteService extends AsyncCreateTaskTemplete {
             if (Objects.nonNull(callbackCreatePdf)) {
                 callbackCreatePdf.callback(map);
             }
+            SystemConstant.REDIS_MQ_LOCK = false;
         }
         return ResultUtil.ok(map);
     }

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

@@ -31,7 +31,6 @@ public class SystemConstant {
     public static final String USER_DIR = "user.dir";
     public static final String PDF_TEMP = "pdf-temp";
     public static final String FILE_TEMP = "file-temp";
-    public static final String DOWNLOAD_TEMP = "download-temp";
     public static final String SESSION = "session:";
     public static final String TASK = "task";
     public static final String TB_TASK_ID = "tbTaskId";
@@ -42,7 +41,6 @@ public class SystemConstant {
     public static final String ERROR = "/error";
     public static final String METHOD = "post";
     public static final String DEFAULT_PASSWORD = "MTIzNDU2";
-    public static final String DEFAULT_MOBILE_NUMBER = "11111111111";
     public static final String UPDATE_TIME = "updateTime";
     public static final String PATH = "path";
     public static final String PDF_PATH = "pdfPath";
@@ -134,6 +132,7 @@ public class SystemConstant {
     public static final String REDIS_LOCK_MQ_PREFIX = "redis:lock:mq:";
     public static final int REDIS_MQ_MAX_RECONSUME = 5;
     public static final String MQ_TOPIC_BUFFER_LIST = "mq:topic:buffer:list";
+    public static boolean REDIS_MQ_LOCK = false;
 
     /**
      * redis lock
@@ -190,7 +189,6 @@ public class SystemConstant {
     public static final String GDYKDX_FLOW_KEY = "GdykdxPaperApprove";//流程key
     public static final String APPROVE_ID = "approveId";//审批id
     public static final String FLOW_ID = "flowId";//流程id
-    public static final String TASK_ID = "taskId";//命题任务id
     public static final String FLOW_TASK_ID = "flowTaskId";//流程任务id
     public static final String APPROVE = "approve";//流程审核变量
     public static final String APPROVE_SETUP = "approveSetup";//流程节点
@@ -199,7 +197,7 @@ public class SystemConstant {
     public static final String APPROVE_REMARK = "approveRemark";//流程审批意见
     public static final String REDIS_LOCK_FLOW_TASK_PREFIX = "redis:lock:flow:task:";//流程节点锁
     public static final long REDIS_LOCK_FLOW_TASK_TIME_OUT = 60L * 2;
-    public static final String REDIS_LOCK_FLOW_PREFIX = "redis:lock:flow:";//流程节点锁
+    public static final String REDIS_LOCK_FLOW_PREFIX = "redis:lock:flow:";//流程锁
     public static final long REDIS_LOCK_FLOW_TIME_OUT = 60L * 2;
 
     /**
@@ -314,7 +312,7 @@ public class SystemConstant {
     public static Long getHeadOrUserSchoolId() {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long schoolId;
-        if(Objects.nonNull(ServletUtil.getRequestHeaderSchoolIdByNotVaild())){
+        if (Objects.nonNull(ServletUtil.getRequestHeaderSchoolIdByNotVaild())) {
             schoolId = Long.parseLong(ServletUtil.getRequestHeaderSchoolIdByNotVaild().toString());
         } else {
             schoolId = sysUser.getSchoolId();

teachcloud-task/src/main/java/com/qmth/teachcloud/task/config/RedisMessageListener.java

@@ -48,6 +48,10 @@ public class RedisMessageListener implements MessageListener {
 
     @Override
     public void onMessage(Message message, byte[] bytes) {
+//        log.info("SystemConstant.REDIS_MQ_LOCK start:{}", SystemConstant.REDIS_MQ_LOCK);
+        if (SystemConstant.REDIS_MQ_LOCK) {
+            return;
+        }
         MqDto mqDto = null;
         AtomicInteger integer = new AtomicInteger(0);
         try {
@@ -77,6 +81,7 @@ public class RedisMessageListener implements MessageListener {
                             finalMap.computeIfAbsent(k, v1 -> finalV);
                         });
                         asyncCreatePdfTempleteService.createPdf(finalMap, null);
+                        SystemConstant.REDIS_MQ_LOCK = true;
                         redisUtil.delete(SystemConstant.MQ_TOPIC_BUFFER_LIST, mqDto.getId());
                         break;
                     } else {
@@ -103,6 +108,7 @@ public class RedisMessageListener implements MessageListener {
                     || mqDto.getAck().intValue() == SystemConstant.POSION_ACK_TYPE)) {
                 redisUtil.releaseLock(SystemConstant.REDIS_LOCK_MQ_PREFIX + mqDto.getId());
             }
+//            log.info("SystemConstant.REDIS_MQ_LOCK end:{}", SystemConstant.REDIS_MQ_LOCK);
         }
     }
 }