Merge remote-tracking branch 'origin/developer' into developer

byit-myth-core/myth-admin-core/src/main/java/com/byit/enums/ScheduleStatusEnum.java

@@ -9,8 +9,8 @@ public enum ScheduleStatusEnum {
 
     UN_START(1, "未运行"),
     STARTING(2, "运行中"),
-    FINISH(3, "暂停"),
-    STOP(4, "完成"),
+    FINISH(4, "暂停"),
+    STOP(3, "完成"),
     ;
 
     private Integer code;

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

 package com.byit.thread.helper;
 
 import com.byit.dto.plugin.StatisticData;
+import com.byit.enums.ScheduleStatusEnum;
 import com.byit.mapper.*;
 import com.byit.model.*;
 import com.byit.thread.BaseThreadRunHelper;
@@ -81,7 +82,7 @@ public class StatusSnapshootThreadRunHelper extends BaseThreadRunHelper {
                         //获取上一个时间
                         Long preHourTime = hourDateTime.minusHours(1).toInstant(ZoneOffset.of("+8")).toEpochMilli();
                         //从凌晨到现在是否有运行实例
-                        if (preHourTime.longValue() > maxRunRecording.getTriggerTime().longValue()){
+                        if (preHourTime.longValue() > maxRunRecording.getTriggerTime().longValue() && ScheduleStatusEnum.FINISH.getCode().equals(maxRunRecording.getFlowStatus())){
                             flowStatusSnapshoot.setFlowStatus(1);
                             flowStatusSnapshoot.setUnstartNode(flow.getFlowNodeCount());
                             flowStatusSnapshootList.add(flowStatusSnapshoot);