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

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

@@ -15,7 +15,6 @@ public enum RunRecordingEnum {
     ,FLOW_STATUS_RUN_ING("2","工作流运行中")
     ,FLOW_STATUS_IS_STOP("3","工作流被暂停")
     ,FLOW_STATUS_IS_END("4","工作流已经完结")
-    ,FLOW_STATUS_IS_LOAD("5","工作流已经被加载")
     ,FAIL_FAST_NO("0","不快速失败")
     ,FAIL_FAST_YES("1","快速失败")
     ;

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/impl/RunRecordingServiceImpl.java

@@ -89,8 +89,7 @@ public class RunRecordingServiceImpl implements RunRecordingService {
         for (RunRecording runRecording : runRecordings) {
             //判断当前的实例  中是否有 未完成的
             if (RunRecordingEnum.FLOW_STATUS_RUN_ING.getCode().equals(runRecording.getFlowStatus()) ||
-                    RunRecordingEnum.FLOW_STATUS_IS_STOP.getCode().equals(runRecording.getFlowStatus()) ||
-                    RunRecordingEnum.FLOW_STATUS_IS_LOAD.getCode().equals(runRecording.getFlowStatus())) {
+                    RunRecordingEnum.FLOW_STATUS_IS_STOP.getCode().equals(runRecording.getFlowStatus())) {
                 return true;
             }
         }

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

@@ -61,7 +61,7 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
      * @throws Exception
      */
     @Override
-    public void saveRunRecordingAndTask(JobTask jobTask) throws UnknownHostException, ParseException {
+    public void     saveRunRecordingAndTask(JobTask jobTask) throws UnknownHostException, ParseException {
         log.info("-----------saveRunRecordingAndTask start【虚节点保存服务】--------------");
         //根据 map_flow_id查询当前的版本的工作流  使用祝工作流的runId 保存到执行记录表和任务表
         Integer mapFlowId = jobTask.getMapFlowId();