bug fix

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

@@ -20,10 +20,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.text.MessageFormat;
-import java.util.Date;
-import java.util.Map;
-import java.util.Objects;
-import java.util.StringJoiner;
+import java.util.*;
 
 /**
  * @Description: 创建pdf模版
@@ -49,10 +46,11 @@ public class AsyncCreatePdfTempleteService extends AsyncCreateTaskTemplete {
     @Override
     public Result createPdf(Map<String, Object> map, CallbackCreatePdf callbackCreatePdf) throws IOException {
         TBTask tbTask = (TBTask) map.get(SystemConstant.TASK);
+        Boolean manual = (Boolean) map.get(SystemConstant.MANUAL);
         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 (dbTask.getStatus() == TaskStatusEnum.FINISH && Objects.nonNull(dbTask.getResult())) {//无需重新生成pdf
+        if (Objects.isNull(manual) && (dbTask.getStatus() == TaskStatusEnum.FINISH && Objects.nonNull(dbTask.getResult()))) {//无需重新生成pdf
             return ResultUtil.ok();
         }
         tbTask.setStatus(TaskStatusEnum.RUNNING);

distributed-print-common/src/main/java/com/qmth/distributed/print/common/contant/SystemConstant.java

@@ -59,6 +59,7 @@ public class SystemConstant {
     public static final int PAGE_NUMBER = 0;
     public static final int PAGE_SIZE = 10000000;
     public static final int ALL_CARD = -1;
+    public static final String MANUAL = "manual";
     public static final String DELIMITER = ":";
 //    public static final int MAX_RETRY_CREATE_PDF_COUNT = 5;
 

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

@@ -90,6 +90,7 @@ public class TBTaskController {
         }
         map.computeIfAbsent(SystemConstant.TASK, v -> tbTask);
         map.computeIfAbsent(SystemConstant.USER, v -> sysUser);
+        map.computeIfAbsent(SystemConstant.MANUAL, v -> true);
         asyncCreatePdfTempleteService.createPdf(map, null);
         return ResultUtil.ok(new EditResult());
     }