修正重跑后 节点无此实例的BUG

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

@@ -479,10 +479,15 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         ValidationUtil.dataNotNull(workspace, runInfo.getWorkspaceName() + "工作空间不存在");
         Flow flow = flowMapper.getByWorkSpaceAndName(workspace.getWorkspaceId(), runInfo.getFlowName());
         ValidationUtil.dataNotNull(flow, runInfo.getFlowName() + "工作流不存在");
-        Node node = nodeMapper.getByNameAndFlow(runInfo.getNodeName(), flow.getFlowId());
-        ValidationUtil.dataNotNull(node, runInfo.getNodeName() + "节点不存在");
+        //6453
         RunRecording runRecording = runRecordingMapper.findRunRecordingByFlowIdAndRunId(flow.getFlowId(), runInfo.getRunId());
         ValidationUtil.dataNotNull(runRecording, "查无此运行记录");
+        //TODO  这里应该查询的是版本表 与版本号挂钩
+        NodeVersion node = nodeVersionMapper.findNodeByNodeNameAndVersionNameAndFlowId(runInfo.getNodeName(),runRecording.getFlowVersionName(),runRecording.getFlowId());
+        //Node node = nodeMapper.getByNameAndFlow(runInfo.getNodeName(), flow.getFlowId());
+        ValidationUtil.dataNotNull(node, runInfo.getNodeName() + "节点不存在");
+
+
         //获取运行日志实例
         JobTaskRunLog jobTaskRunLog = jobTaskRunLogMapper.findByRunIdAndNodeId(runInfo.getRunId(), node.getNodeId());
         ValidationUtil.dataNotNull(jobTaskRunLog, "查无此运行记录");

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

 package com.byit.mapper;
 
 import com.byit.model.NodeVersion;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -13,6 +14,8 @@ public interface NodeVersionMapper {
      * @return
      */
     List<NodeVersion> findAllByFlowId(Integer flowId);
+
+    NodeVersion findNodeByNodeNameAndVersionNameAndFlowId(@Param("nodeName") String nodeName, @Param("versionName")String versionName, @Param("flowId")Integer flowId);
     /**
      * 查询全部的节点版本
      * @return

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

@@ -81,6 +81,14 @@
   </select>
 
 
+  <select id="findNodeByNodeNameAndVersionNameAndFlowId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from node_version
+    where flow_id = #{flowId} and version_name = #{versionName} and node_name = #{nodeName}
+  </select>
+
+
   <delete id="deleteById" parameterType="java.lang.Integer">
     <!-- generated @mbg.generated date: 2019-12-31 -->
     delete from node_version