修复任务重试

src/main/java/com/nokia/dingtalk_api/pojos/bo/AppTaskBo.java

@@ -1,11 +1,15 @@
 package com.nokia.dingtalk_api.pojos.bo;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class AppTaskBo {
     /**
      * 任务id
@@ -227,4 +231,52 @@ public class AppTaskBo {
      * 日期参数
      */
     private String dateString;
+
+    public AppTaskBo(AppTaskBo t) {
+        this.taskId = t.getTaskId();
+        this.taskName = t.getTaskName();
+        this.description = t.getDescription();
+        this.status = t.getStatus();
+        this.cron = t.getCron();
+        this.appId = t.getAppId();
+        this.robotCode = t.getRobotCode();
+        this.conversationType = t.getConversationType();
+        this.openConversationId = t.getOpenConversationId();
+        this.phones = t.getPhones();
+        this.userIds = t.getUserIds();
+        this.sftpId = t.getSftpId();
+        this.masterDir = t.getMasterDir();
+        this.hasSubdirectory = t.getHasSubdirectory();
+        this.subdirectoryMethod = t.getSubdirectoryMethod();
+        this.dirTimeDelay = t.getDirTimeDelay();
+        this.subdirectoryPattern = t.getSubdirectoryPattern();
+        this.fileToText = t.getFileToText();
+        this.fileMethod = t.getFileMethod();
+        this.fileTimeDelay = t.getFileTimeDelay();
+        this.filePrefix = t.getFilePrefix();
+        this.fileExtension = t.getFileExtension();
+        this.filePattern = t.getFilePattern();
+        this.taskTimeout = t.getTaskTimeout();
+        this.maxRetryTimes = t.getMaxRetryTimes();
+        this.retryInterval = t.getRetryInterval();
+        this.createTime = t.getCreateTime();
+        this.updateTime = t.getUpdateTime();
+        this.appName = t.getAppName();
+        this.robotSecret = t.getRobotSecret();
+        this.robotName = t.getRobotName();
+        this.host = t.getHost();
+        this.port = t.getPort();
+        this.username = t.getUsername();
+        this.password = t.getPassword();
+        this.retryTimes = t.getRetryTimes();
+        this.retryTime = t.getRetryTime();
+        this.alertType = t.getAlertType();
+        this.alertRobotName = t.getAlertRobotName();
+        this.alertRobotCode = t.getAlertRobotCode();
+        this.alertRobotSecret = t.getAlertRobotSecret();
+        this.alertOpenConversationId = t.getAlertOpenConversationId();
+        this.alertPhones = t.getAlertPhones();
+        this.alertUserIds = t.getAlertUserIds();
+        this.dateString = t.getDateString();
+    }
 }

src/main/java/com/nokia/dingtalk_api/service/AppTaskService.java

@@ -284,15 +284,17 @@ public class AppTaskService {
      */
     public void retry(AppTaskBo t) {
         try {
+            log.debug("retryTimes: {} < {} {}", t.getRetryTimes(), t.getMaxRetryTimes(), t.getRetryTimes() < t.getMaxRetryTimes());
             if (t.getRetryTimes() < t.getMaxRetryTimes()) {
                 Instant instant = Instant.now().plusSeconds(t.getRetryInterval());
                 RetryAppTaskPo retryAppTaskPo = new RetryAppTaskPo();
                 retryAppTaskPo.setRetryTime(instant);
                 retryAppTaskPo.setTaskId(t.getTaskId());
-                retryAppTaskPo.setRetryTimes(t.getRetryTimes());
+                retryAppTaskPo.setRetryTimes(t.getRetryTimes() + 1);
                 iRetryAppTaskService.saveOrUpdate(retryAppTaskPo);
-                t.setRetryTimes(t.getRetryTimes() + 1);
-                ScheduledFuture<?> future = taskScheduler.schedule(() -> runTask(t), instant);
+                AppTaskBo n = new AppTaskBo(t);
+                n.setRetryTimes(n.getRetryTimes() + 1);
+                ScheduledFuture<?> future = taskScheduler.schedule(() -> runTask(n), instant);
                 log.debug("getActiveCount: {}", taskScheduler.getActiveCount());
                 RETRY_TASKS.put(t.getTaskId(), future);
             }