修正查询实例状态接口

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

@@ -60,7 +60,7 @@ public class ApiFlowFindServiceImpl implements ApiFlowFindService {
             }else if(RunRecordingEnum.FLOW_STATUS_RUN_ING.getCode().equals(runRecording.getFlowStatus())) {
                 //运行中
                 runRecordingStatusDto.setStatus(RunRecordingStatusDto.RUN_ING);
-            }else if(RunRecordingEnum.FLOW_STATUS_IS_STOP.getCode().equals(RunRecordingStatusDto.RUN_ING)){
+            }else if(RunRecordingEnum.FLOW_STATUS_IS_STOP.getCode().equals(runRecording.getFlowStatus())){
                 //运行中
                 runRecordingStatusDto.setStatus(RunRecordingStatusDto.RUN_ING);
             }else if(RunRecordingEnum.FLOW_STATUS_IS_END.getCode().equals(runRecording.getFlowStatus())){

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

@@ -144,6 +144,7 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
                 MakeUpReturn makeUpReturn = new MakeUpReturn();
                 makeUpReturn.setFlowName(waitingRecord.getFlowName());
                 makeUpReturn.setRunId(waitingRecord.getRunId());
+                makeUpReturn.setRepairTime(waitingRecord.getRepeatTime());
                 return makeUpReturn;
             }).collect(Collectors.toList());
         }

byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/recording/RunRecordingStatusDto.java

@@ -17,20 +17,20 @@ public class RunRecordingStatusDto  implements Serializable {
     /**
      * 排队中
      */
-    public static final String QUEUE_ING = "1";
+    public static final Integer QUEUE_ING = 1;
     /**
      * 运行中
      */
-    public static final String RUN_ING = "2";
+    public static final Integer RUN_ING = 2;
     /**
      * 成功
      */
-    public static final String SUCCESS = "3";
+    public static final Integer SUCCESS = 3;
 
     /**
      * 失败
      */
-    public static final String FAILURE = "4";
+    public static final Integer FAILURE = 4;
 
     private String flowName;
     private String runId;
@@ -38,6 +38,6 @@ public class RunRecordingStatusDto  implements Serializable {
      * 对应DDMP的质检状态： 1：排队中； 2：质检中； 3：质检完成； 4：质检失败
      * 对应调度的运行状态：  1：未开始； 2：运行中/暂停中  4-1|4-3：成功    4-2|4-4|4-5：失败
      */
-    private String status;
-    private String statusDetails = "1：排队中； 2：质检中； 3：质检完成； 4：质检失败";
+    private Integer status;
+    private final String statusDetails = "1：排队中； 2：质检中； 3：质检完成； 4：质检失败";
 }

byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/specials/MakeUpReturn.java

@@ -16,4 +16,5 @@ public class MakeUpReturn  implements Serializable {
     private static final long serialVersionUID = -2055527438048313575L;
     private String flowName;
     private String runId;
+    private String repairTime;
 }