Merge remote-tracking branch 'origin/developer' into developer

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

@@ -205,7 +205,6 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         List<Node> nodeList = nodeMapper.findOnforkByFlowId(flow.getFlowId());
         //删除在调度上的节点的相关依赖
         nodeList.forEach(node -> nodeDependencyMapper.deleteByNodeId(node.getNodeId()));
-        nodeMapper.updateOnforkDown(flow.getFlowId());
 
         //查找并删除工作流下的虚节点
         List<Node> virtualNodeList = nodeMapper.findVirtualByFlowId(flow.getFlowId());
@@ -220,23 +219,16 @@ public class ApiFlowServiceImpl implements ApiFlowService {
                 flowMapper.updateByIdSelective(virtualFlow);
             }
         }
-        //删除工作流下虚拟的节点
-        nodeMapper.deleteVirtualNode(flow.getFlowId());
+        //删除工作流下所有的节点
+        nodeMapper.deleteByFlowId(flow.getFlowId());
 
         //重新组建节点和依赖关系
         HashMap<String, Integer> nameIdRel = new HashMap<>();
         //保存节点信息
         for(PluginBaseNode pluginNode : pluginNodeList){
-            //查询这个节点是否存在  存在就修改节点  不存在就新建节点
-            Node node = nodeMapper.getByNameAndFlow(pluginNode.getName(), flow.getFlowId());
-            if (null == node){
-                node = new Node();
+            Node node = new Node();
             buildNode(pluginNode, flow, node);
             Integer nodeId = nodeMapper.insertSelective(node);
-            }else {
-                buildNode(pluginNode, flow, node);
-                nodeMapper.updateByIdSelective(node);
-            }
             nameIdRel.put(node.getNodeName(), node.getNodeId());
         }