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

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

@@ -10,4 +10,9 @@ public interface ApiNodeCheckService {
      * @param mainFlowId 主工作流的id
      */
     void checkFlowNode(Integer mainFlowId);
+
+    /**
+     * 工作流节点校验 删除不在调度上的节点
+     */
+    void checkFlowNode();
 }

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

@@ -133,7 +133,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         log.debug("生成版本");
         FlowVersion flowVersion = saveFlowVersion(flow);
 
-        apiNodeCheckService.checkFlowNode(flow.getFlowId());
+        apiNodeCheckService.checkFlowNode();
         log.debug("插件端通过API保存成功！");
     }
 

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

@@ -28,7 +28,12 @@ public class ApiNodeCheckServiceImpl implements ApiNodeCheckService {
         this.flowService = flowService;
     }
 
+    /**
+     * 废弃原因：查询次数多，性能低
+     * @param mainFlowId 主工作流的id
+     */
     @Override
+    @Deprecated
     public void checkFlowNode(Integer mainFlowId) {
         //查询工作流
         FlowVo mainFlow = flowService.getFlowId(mainFlowId);
@@ -48,6 +53,14 @@ public class ApiNodeCheckServiceImpl implements ApiNodeCheckService {
         nodeService.deleteNode(collect);
     }
 
+    /**
+     * 删除不在调度上的节点
+     */
+    @Override
+    public void checkFlowNode() {
+        nodeService.deleteNoForkNode();
+    }
+
     private void getAllInnerNode(List<Node> mainNodes,List<Node> candidateNodes){
         for (Node node : mainNodes) {
             if("1".equals(node.getIsVirtual())) {

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

@@ -97,4 +97,10 @@ public interface NodeMapper {
     List<Node> findbyFlowIds(@Param("flowIdList")List<Integer> flowIdList);
 
     int deleteNodeByIds(@Param("ids") List<Integer> ids);
+
+    /**
+     * 删除不在调度上的
+     * @return
+     */
+    int deleteNoForkNode();
 }
\ No newline at end of file

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/NodeService.java

@@ -28,4 +28,10 @@ public interface NodeService {
 
     int deleteNode(List<Integer> ids);
 
+    /**
+     * 删除不在调度上的节点
+     * @return 删除数目
+     */
+    int deleteNoForkNode();
+
 }

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

@@ -36,4 +36,9 @@ public class NodeServiceImpl implements NodeService {
 
         return nodeMapper.deleteNodeByIds(ids);
     }
+
+    @Override
+    public int deleteNoForkNode() {
+        return nodeMapper.deleteNoForkNode();
+    }
 }

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

@@ -496,4 +496,8 @@
     where node_id = #{nodeId,jdbcType=INTEGER}
   </update>
 
+  <delete id="deleteNoForkNode">
+    delete from node where on_fork = '1'
+  </delete>
+
 </mapper>
\ No newline at end of file