暂停BUG

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

@@ -1536,6 +1536,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         if ("3".equals(runRecording.getFlowStatus())) {
             StopFlowParam stopFlowParam = new StopFlowParam();
             stopFlowParam.setRunIds(runRecording.getRunId());
+            stopFlowParam.setFlowName(flowName);
             stopFlowParam.setAllStartFlow("1");
             reStartSchedule(stopFlowParam);
         } else {
@@ -1672,7 +1673,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         //暂停工作流调度
         recordingList.forEach(runRecording -> {
             //runRecordingMapper.stopByRunIdAndFlowId(runRecording.getRunId(), runRecording.getFlowId());
-            runRecordingMapper.stopByRunId(runRecording.getRunId());
+            runRecordingMapper.stopByRunIdAndFlowId(runRecording.getRunId(), runRecording.getFlowId());
             jobTaskMapper.stopByRunIdAndFlowId(runRecording.getRunId(), runRecording.getFlowId());
             runids.append(runRecording.getRunId() + ",");
         });
@@ -1685,13 +1686,19 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         ValidationUtil.dataNotNull(stopFlowParam, "执行参数不允许为空！");
         String runIds = stopFlowParam.getRunIds();
         ValidationUtil.dataNotBank(runIds, "运行id不允许为空！");
+        String flowName = stopFlowParam.getFlowName();
+        ValidationUtil.dataNotBank(flowName, "工作流名称不允许为空！");
 
         List<String> runIdList = Arrays.asList(runIds.split(","));
-        runIdList.forEach(runId -> {
+        for (String runId : runIdList) {
             List<RunRecording> runRecordList = runRecordingMapper.findStopRunCordByRunId(runId);
-            log.warn("---------运行记录{}，不存在暂停记录中！---", runId);
-            ValidationUtil.isTrueValidation(CollectionUtil.isEmpty(runRecordList), "该工作流不是暂停状态！");
-            RunRecording mainRunRecording = runRecordList.stream().filter(runRecording -> "1".equals(runRecording.getIsInner())).findFirst().orElse(null);
+
+            //ValidationUtil.isTrueValidation(CollectionUtil.isEmpty(runRecordList), "该工作流不是暂停状态！");
+            if(CollectionUtil.isEmpty(runRecordList)){
+                log.warn("---------运行记录{}，不存在暂停记录中！---", runId);
+                return;
+            }
+            RunRecording mainRunRecording = runRecordList.stream().filter(runRecording -> flowName.equals(runRecording.getFlowName())).findFirst().orElse(null);
             Integer stopCount = 0;
             if (mainRunRecording != null) {
                 stopCount = mainRunRecording.getStopCount();
@@ -1701,11 +1708,11 @@ public class ApiFlowServiceImpl implements ApiFlowService {
                 mainRunRecording.setStopCount(stopCount);
                 runRecordingMapper.updateRunRecordingById(mainRunRecording);
             } else {
-                runRecordingMapper.startByRunId(runId);
-                jobTaskMapper.startByRunId(runId);
+                runRecordingMapper.startByRunIdAndFlowId(runId, mainRunRecording.getFlowId());
+                jobTaskMapper.startByRunIdAndFlowId(runId, mainRunRecording.getFlowId());
             }
 
-        });
+        }
     }
 }
 

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

@@ -104,7 +104,15 @@ public interface JobTaskMapper {
      * @param runId
      * @return
      */
-    int startByRunId(String runId);
+    int startByRunId(@Param("runId")String runId);
+
+    /**
+     * 根据runid开始调度
+     * @param runId
+     * @param flowId
+     * @return
+     */
+    int startByRunIdAndFlowId(@Param("runId")String runId, @Param("flowId") Integer flowId);
 
     int stopJobTask(@Param("runId") String runId, @Param("nodeIds")List<Integer> nodeIds);
 

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

@@ -163,6 +163,14 @@ public interface RunRecordingMapper {
     int startByRunId(String runId);
 
     /**
+     * 开始实例  基于runid和工作流名称
+     * @param runId
+     * @param flowId
+     * @return
+     */
+    int startByRunIdAndFlowId(@Param("runId") String runId, @Param("flowId")Integer flowId);
+
+    /**
      * 根据runid查找停止的运行记录
      * @param runId
      * @return

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

@@ -473,6 +473,11 @@
     where run_id = #{runId,jdbcType=VARCHAR}
   </update>
 
+  <update id="startByRunIdAndFlowId" parameterType="string">
+    update job_task set trigger_status = '1'
+    where run_id = #{runId,jdbcType=VARCHAR} and flow_id = #{flowId,jdbcType=INTEGER}
+  </update>
+
   <!--多个删除-->
   <delete id="deleteInId" parameterType="com.byit.model.JobTaskSchedule">
     delete from job_task

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

@@ -695,6 +695,12 @@
             and flow_status = '3'
   </update>
 
+  <update id="startByRunIdAndFlowId">
+     update run_recording set flow_status = '2', stop_count = 0
+     where run_id = #{runId,jdbcType=VARCHAR}
+            and flow_status = '3' and flow_id = #{flowId,jdbcType=INTEGER}
+  </update>
+
   <update id="killUnFinshFlow">
     update run_recording set flow_status = '4',flow_run_result = '5'
      where run_id = #{runId,jdbcType=VARCHAR}

byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/plugin/StopFlowParam.java

@@ -9,6 +9,8 @@ import lombok.Data;
  */
 @Data
 public class StopFlowParam {
+
+    private String flowName;
     private String runIds;
 
     private String allStartFlow = "0";