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

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

+package com.byit.enums;
+
+/**
+ * @author huangfu
+ */
+
+public enum JobTriggerStatusEnums {
+
+    STOP("0","暂停"),
+    START("1","开始")
+    ;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    JobTriggerStatusEnums(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    private String code;
+    private String name;
+}

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

 package com.byit.thread;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.byit.enums.JobTriggerStatusEnums;
 import com.byit.job.WorkRoulette;
 import com.byit.model.*;
 import com.byit.service.*;
@@ -128,6 +129,12 @@ public class JobScheduleHelper{
                     if(CollectionUtil.isNotEmpty(jobTasks)){
                         List<JobTaskSchedule> jobTaskSchedules = new ArrayList<JobTaskSchedule>(15);
                         jobTasks.forEach(jobTask -> {
+                            //判断是否是暂停状态  如果是暂停状态那么直接跳过这个节点 不执行
+                            String triggerStatus = jobTask.getTriggerStatus();
+                            if(JobTriggerStatusEnums.STOP.getCode().equals(triggerStatus)){
+                                log.debug("--------------【{}节点处于暂停状态，跳过该节点】------------------");
+                                return;
+                            }
                             //虚节点的状态
                             if("0".equals(jobTask.getIsVirtual())){
                                 try {