Selaa lähdekoodia

流程数据修改

wangliang 3 vuotta sitten
vanhempi
commit
6d15a2eb02

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

@@ -50,7 +50,7 @@ public class AsyncCreatePdfTempleteService extends AsyncCreateTaskTemplete {
         StringJoiner stringJoinerSummary = new StringJoiner("\n").add(MessageFormat.format("{0}{1}{2}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), BEGIN_TITLE, OBJ_TITLE));
         TBTaskService tbTaskService = SpringContextHolder.getBean(TBTaskService.class);
         TBTask dbTask = tbTaskService.getById(tbTask.getId());
-        if (Objects.isNull(manual) && (Objects.nonNull(dbTask) && dbTask.getStatus() == TaskStatusEnum.FINISH && Objects.nonNull(dbTask.getResult()))) {//无需重新生成pdf
+        if (Objects.isNull(manual) && (Objects.nonNull(dbTask) && (dbTask.getStatus() == TaskStatusEnum.FINISH || dbTask.getStatus() == TaskStatusEnum.RUNNING) && Objects.nonNull(dbTask.getResult()))) {//无需重新生成pdf
             return ResultUtil.ok();
         }
         tbTask.setStatus(TaskStatusEnum.RUNNING);

+ 3 - 3
distributed-print/src/main/java/com/qmth/distributed/print/start/StartRunning.java

@@ -24,15 +24,15 @@ public class StartRunning implements CommandLineRunner {
     @Resource
     private OrgCenterDataDisposeService orgCenterDataDisposeService;
 
-    @Resource
-    PrintCommonService printCommonService;
+//    @Resource
+//    PrintCommonService printCommonService;
 
     @Override
     public void run(String... args) throws Exception {
         log.info("服务器启动时执行 start");
         SystemConstant.initTempFiles();
         orgCenterDataDisposeService.updateSchoolInfo();
-        printCommonService.updateStatus();
+//        printCommonService.updateStatus();
         log.info("服务器启动时执行 end");
     }
 }

+ 5 - 0
teachcloud-task/src/main/java/com/qmth/teachcloud/task/start/StartRunning.java

@@ -1,6 +1,7 @@
 package com.qmth.teachcloud.task.start;
 
 import com.qmth.boot.redis.uid.RedisMachineService;
+import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.service.OrgCenterDataDisposeService;
 import com.qmth.teachcloud.common.util.RedisUtil;
@@ -35,11 +36,15 @@ public class StartRunning implements CommandLineRunner {
     @Resource
     JobService jobService;
 
+    @Resource
+    PrintCommonService printCommonService;
+
     @Override
     public void run(String... args) throws Exception {
         log.info("服务器启动时执行 start");
         SystemConstant.initTempFiles();
         jobService.machineHeart();
+        printCommonService.updateStatus();
 
         log.info("增加学校信息同步定时任务 start");
         Map schoolJobMap = new HashMap();