调整包位置

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/JobTaskRunLogAndJobTaskService.java → byit-myth-core/myth-admin-core/src/main/java/com/byit/service/mapservice/JobTaskRunLogAndJobTaskService.java

-package com.byit.service;
+package com.byit.service.mapservice;
 
 import com.byit.model.JobTaskRunLog;
 import org.springframework.transaction.annotation.Transactional;

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/impl/JobTaskRunLogAndJobTaskServiceImpl.java → byit-myth-core/myth-admin-core/src/main/java/com/byit/service/mapservice/impl/JobTaskRunLogAndJobTaskServiceImpl.java

-package com.byit.service.impl;
+package com.byit.service.mapservice.impl;
 
 import com.byit.model.JobTask;
 import com.byit.model.JobTaskRunLog;
 import com.byit.model.Node;
-import com.byit.service.JobTaskRunLogAndJobTaskService;
+import com.byit.service.mapservice.JobTaskRunLogAndJobTaskService;
 import com.byit.service.JobTaskRunLogService;
 import com.byit.service.JobTaskService;
 import com.byit.service.NodeService;
@@ -47,7 +47,7 @@ public class JobTaskRunLogAndJobTaskServiceImpl implements JobTaskRunLogAndJobTa
         //获取剩余失败重试间隔
         Integer failedRemainingCount = jobTaskRunLog.getFailedRemainingCount();
         //计算重试间隔时间
-        Long nextReTime = (failedRetryCount-failedRemainingCount)*failedRetryInterval;
+        long nextReTime = (failedRetryCount-failedRemainingCount)*failedRetryInterval;
         //获取当前时间
         long endTime = System.currentTimeMillis();
         //获取重试时间

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/LogScanHelper.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.byit.enums.RunRecordingEnum;
 import com.byit.model.JobTaskRunLog;
 import com.byit.model.RunRecording;
-import com.byit.service.JobTaskRunLogAndJobTaskService;
+import com.byit.service.mapservice.JobTaskRunLogAndJobTaskService;
 import com.byit.service.JobTaskRunLogService;
 import com.byit.service.RunRecordingService;
 import lombok.extern.slf4j.Slf4j;

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/helper/FailedRetryThreadRunHelper.java

@@ -2,7 +2,7 @@ package com.byit.thread.helper;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.byit.model.JobTaskRunLog;
-import com.byit.service.JobTaskRunLogAndJobTaskService;
+import com.byit.service.mapservice.JobTaskRunLogAndJobTaskService;
 import com.byit.service.JobTaskRunLogService;
 import com.byit.thread.BaseThreadRunHelper;
 import lombok.extern.slf4j.Slf4j;

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/helper/FlowThreadRunHelper.java

 package com.byit.thread.helper;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.byit.job.utils.CronExpression;
 import com.byit.model.Flow;
 import com.byit.model.Node;
 import com.byit.service.FlowService;
 import com.byit.service.NodeService;
 import com.byit.service.RunNodeServer;
-import com.byit.service.RunRecordingService;
 import com.byit.thread.BaseThreadRunHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.sql.DataSource;
-import java.text.ParseException;
-import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -31,15 +27,13 @@ public class FlowThreadRunHelper extends BaseThreadRunHelper {
     private final FlowService flowService;
     private final NodeService nodeService;
     private final RunNodeServer runNodeServer;
-    private final RunRecordingService runRecordingService;
 
     public FlowThreadRunHelper(DataSource dataSource, FlowService flowService, NodeService nodeService,
-                               RunNodeServer runNodeServer, RunRecordingService runRecordingService) {
+                               RunNodeServer runNodeServer) {
         this.dataSource = dataSource;
         this.flowService = flowService;
         this.nodeService = nodeService;
         this.runNodeServer = runNodeServer;
-        this.runRecordingService = runRecordingService;
     }
 
     @Override