添加获取当前工作流状态接口

byit-myth-admin/src/main/java/com/byit/api/ApiFlowController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description: 工作流操作的API接口
@@ -185,4 +186,11 @@ public class ApiFlowController {
         return ResponseResult.ok(collectData);
     }
 
+    @PostMapping("/loadCurrentStatus")
+    @ApiOperation("获取当前的工作流运行状态")
+    public ResponseResult loadCurrentStatus(String param){
+        Map<String, RunRecording> statusMap = apiFlowService.loadCurrentStatus(param);
+        return ResponseResult.ok(statusMap);
+    }
+
 }

byit-myth-admin/src/main/java/com/byit/service/ApiFlowService.java

@@ -7,6 +7,7 @@ import com.byit.model.vo.RunRecordingVo;
 
 import java.text.ParseException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description: 工作流的api请求业务处理接口
@@ -95,4 +96,11 @@ public interface ApiFlowService {
      * @return
      */
     CollectData loadNodeStatisticData(String param);
+
+    /**
+     * 获取工作流的当前状态
+     * @param param
+     * @return
+     */
+    Map<String, RunRecording> loadCurrentStatus(String param);
 }

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

@@ -893,6 +893,36 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         return collectData;
     }
 
+    @Override
+    public Map<String, RunRecording> loadCurrentStatus(String param) {
+        ValidationUtil.dataNotBank(param, "请求参数不允许为空！");
+        JSONObject jsonObject = JSON.parseObject(param);
+        //获取工作空间名称
+        String workspaceName = jsonObject.getString("workspaceName");
+        ValidationUtil.dataNotBank(workspaceName, "工作空间名称不允许为空！");
+        Workspace workspace = workspaceMapper.getByName(workspaceName);
+        ValidationUtil.dataNotNull(workspace, workspaceName + "工作空间不存在");
+        //获取工作流名称
+        String flowNames = jsonObject.getString("flowNames");
+        ValidationUtil.dataNotBank(flowNames, "工作流名称不允许为空！");
+        List<String> flowNameList = Arrays.asList(flowNames.split(","));
+        List<Flow> flowList = new ArrayList<>();
+        flowNameList.forEach(flowName->{
+            Flow flow = flowMapper.getByWorkSpaceAndName(workspace.getWorkspaceId(), flowName);
+            ValidationUtil.dataNotNull(flow, flowName + "工作流不存在");
+            flowList.add(flow);
+        });
+
+        Map<String, RunRecording> statusMap = new HashMap<>();
+
+        flowList.forEach(flow -> {
+            RunRecording runRecording = runRecordingMapper.findNewStatus(flow.getFlowId());
+            statusMap.put(flow.getFlowName(), runRecording);
+        });
+
+        return statusMap;
+    }
+
     /**
      * runState  补批机制   1 补批当前节点   2   补批当前节点及以下节点
      * @param param

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/FlowMapper.java

@@ -54,4 +54,5 @@ public interface FlowMapper {
      * @return
      */
     List<Flow> findAll();
+
 }
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/RunRecordingMapper.java

@@ -180,4 +180,11 @@ public interface RunRecordingMapper {
      * @return
      */
     List<RunRecording> findByPreTime(@Param("preHourDate")Date preHourDate, @Param("flowId")Integer flowId);
+
+    /**
+     * 根据flowid获取最新的运行实例
+     * @param flowId
+     * @return
+     */
+    RunRecording findNewStatus(Integer flowId);
 }
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/resources/mapper/RunRecordingMapper.xml

@@ -194,7 +194,19 @@
         )
   </select>
 
-  <delete id="deleteById" parameterType="java.lang.Integer">
+    <select id="findNewStatus" resultMap="BaseResultMap">
+      select
+      <include refid="Base_Column_List" />
+      from run_recording
+      where flow_id = #{flowId}
+            and trigger_time = (
+            select max(trigger_time)
+            from run_recording
+            where flow_id = #{flowId}
+      )
+    </select>
+
+    <delete id="deleteById" parameterType="java.lang.Integer">
     <!-- generated @mbg.generated date: 2019-12-25 -->
     delete from run_recording
     where recording_id = #{recordingId,jdbcType=INTEGER}

byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/utils/JobUtils.java

@@ -101,6 +101,10 @@ public class JobUtils {
      */
     public static final String REQUEST_LOADNODESTATISTICDATA = "/api/flow/loadNodeStatisticData";
     /**
+     * 获取当前的工作流运行状态
+     */
+    public static final String REQUEST_LOADCURRENTSTATUS = "/api/flow/loadCurrentStatus";
+    /**
      * 补批工作流
      */
     public static final String REQUEST_REPAIRFLOW = "/api/flow/repairFlow";
@@ -424,6 +428,21 @@ public class JobUtils {
     }
 
     /**
+     * 获取当前的工作流运行状态
+     * @param workspaceName 工作空间名称
+     * @param flowNames     工作流名称，多个以","分割
+     * @return
+     */
+    public static ResponseResult loadCurrentStatus(String workspaceName, String flowNames){
+        Map<String, Object> param = new HashMap<>();
+        param.put("workspaceName", workspaceName);
+        param.put("flowNames", flowNames);
+        String response = createHttpRequest(REQUEST_LOADCURRENTSTATUS, "param=" + JSON.toJSONString(param));
+        log.info("--------------------获取当前的工作流运行状态接口调用成功，结果为：{}------------------------",response);
+        return JSON.parseObject(response, ResponseResult.class);
+    }
+
+    /**
      * 补批工作流
      * @param workspaceName  工作空间名称
      * @param flowName        工作流名称