置成功

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

@@ -129,7 +129,7 @@ public class ApiFlowController {
 
     @PostMapping("madeSuccess")
     @ApiOperation("手动置为成功")
-    public ResponseResult madeSuccess(String param) {
+    public ResponseResult madeSuccess(@RequestBody RunInfo param) {
         apiFlowService.madeSuccess(param);
         return ResponseResult.ok("SUCCESS");
     }

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

@@ -53,9 +53,9 @@ public interface ApiFlowService {
 
     /**
      * 手动置为成功
-     * @param param
+     * @param runInfo
      */
-    void madeSuccess(String param);
+    void madeSuccess(RunInfo runInfo);
 
     /**
      * 重跑工作流

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

@@ -743,12 +743,11 @@ public class ApiFlowServiceImpl implements ApiFlowService {
     /**
      * 重跑任务
      *
-     * @param param
+     * @param runInfo
      */
     @Override
-    public void madeSuccess(String param) {
-        ValidationUtil.dataNotBank(param, "请求参数不允许为空！");
-        RunInfo runInfo = JSON.parseObject(param, RunInfo.class);
+    public void madeSuccess(RunInfo runInfo) {
+        ValidationUtil.dataNotNull(runInfo, "请求参数不允许为空！");
 
         ValidationUtil.dataNotBank(runInfo.getWorkspaceName(), "工作空间名称不允许为空！");
         ValidationUtil.dataNotBank(runInfo.getFlowName(), "工作流名称不允许为空！");
@@ -759,9 +758,15 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         //开始校验
         Workspace workspace = workspaceMapper.getByName(runInfo.getWorkspaceName());
         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());
+
+        String versionName = runInfo.getVersionName();
+
+        FlowVersion byWorkSpaceAndName = flowVersionMapper.getByWorkSpaceAndName(workspace.getWorkspaceId(), runInfo.getFlowName(), versionName);
+
+        //Flow flow = flowMapper.getByWorkSpaceAndName(workspace.getWorkspaceId(), runInfo.getFlowName());
+        ValidationUtil.dataNotNull(byWorkSpaceAndName, runInfo.getFlowName() + "工作流不存在");
+
+        Node node = nodeMapper.getByNameAndFlow(runInfo.getNodeName(), byWorkSpaceAndName.getFlowId());
         ValidationUtil.dataNotNull(node, runInfo.getNodeName() + "节点不存在");
         //获取运行日志实例
         JobTaskRunLog jobTaskRunLog = jobTaskRunLogMapper.findByRunIdAndNodeId(runInfo.getRunId(), node.getNodeId());

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

 package com.byit.mapper;
 
 import com.byit.dto.FlowConditionDto;
+import com.byit.model.Flow;
 import com.byit.model.FlowVersion;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -25,6 +27,14 @@ public interface FlowVersionMapper {
     int updateByIdSelective(FlowVersion record);
 
     /**
+     * 根据工作空间和工作流名称查找是否存在工作流
+     * @param workspaceId
+     * @param flowName
+     * @return
+     */
+    FlowVersion getByWorkSpaceAndName(@Param("workspaceId") Integer workspaceId, @Param("flowName") String flowName, @Param("versionName")String versionName);
+
+    /**
      * 根据当前工作流id查找当前应用的版本
      * @param flowId
      * @return

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

@@ -70,7 +70,17 @@
         and version_mark = '0'
   </select>
 
-  <delete id="deleteById" parameterType="java.lang.Integer">
+
+    <select id="getByWorkSpaceAndName" resultType="com.byit.model.FlowVersion">
+      select
+      <include refid="Base_Column_List" />
+      from flow_version
+      where workspace_id = #{workspaceId}
+      and flow_name = #{flowName}
+        and version_name = #{versionName}
+    </select>
+
+    <delete id="deleteById" parameterType="java.lang.Integer">
     <!-- generated @mbg.generated date: 2019-12-31 -->
     delete from flow_version
     where flow_version_id = #{flowVersionId,jdbcType=INTEGER}

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

@@ -39,4 +39,9 @@ public class RunInfo {
      * 操作人
      */
     private String operator;
+
+    /**
+     * 版本号
+     */
+    private String versionName;
 }

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

@@ -562,7 +562,7 @@ public class JobUtils {
      */
     public static ResponseResult makeSuccess(RunInfo runInfo) {
         //发送请求 添加任务
-        String response = createHttpRequest(REQUEST_FLOW_MAKESUCCESS, "param=" + JSON.toJSONString(runInfo, WriteClassName));
+        String response = createHttpRequest(REQUEST_FLOW_MAKESUCCESS, JSON.toJSONString(runInfo, WriteClassName));
         log.debug("--------------------手动置为成功接口调用成功，结果为：{}------------------------", response);
         return JSON.parseObject(response, ResponseResult.class);
     }