流程

hx-common/service-flow/src/main/java/com/fjhx/controller/example/ExampleDetailsController.java

@@ -1,24 +0,0 @@
-package com.fjhx.controller.example;
-
-import com.fjhx.service.example.ExampleDetailsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 实例明细 前端控制器
- * </p>
- *
- * @author ${author}
- * @since 2022-08-23
- */
-@RestController
-@RequestMapping("/exampleDetails")
-public class ExampleDetailsController {
-
-    @Autowired
-    private ExampleDetailsService exampleDetailsService;
-
-}
-

hx-common/service-flow/src/main/java/com/fjhx/controller/process/ProcessNodeController.java

@@ -1,43 +0,0 @@
-package com.fjhx.controller.process;
-
-import com.fjhx.entity.process.ProcessNode;
-import com.fjhx.entity.process.ProcessNodeButton;
-import com.fjhx.params.NodeDetailsVo;
-import com.fjhx.service.process.ProcessNodeButtonService;
-import com.fjhx.service.process.ProcessNodeService;
-import org.springblade.core.tool.api.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author ${author}
- * @since 2022-08-12
- */
-@RestController
-@RequestMapping("/processNode")
-public class ProcessNodeController {
-
-    @Autowired
-    private ProcessNodeService processNodeService;
-
-    @Autowired
-    private ProcessNodeButtonService processNodeButtonService;
-
-    /**
-     * 保存节点
-     */
-    @PostMapping("/saveNodeList")
-    public R saveNodeList(@RequestBody NodeDetailsVo nodeDetailsVo) {
-        processNodeButtonService.insertNodeButton(nodeDetailsVo);
-        return R.success();
-    }
-
-}
-

hx-common/service-flow/src/main/java/com/fjhx/controller/process/ProcessTenantController.java

@@ -1,8 +1,8 @@
 package com.fjhx.controller.process;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.process.ProcessNode;
 import com.fjhx.entity.process.ProcessTenant;
+import com.fjhx.params.NodeDetailsVo;
 import com.fjhx.service.process.ProcessTenantService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,9 +51,9 @@ public class ProcessTenantController {
      * 添加流程版本
      */
     @PostMapping("/addVersion")
-    public R addVersion(@RequestBody ProcessTenant processTenant) {
-        List<ProcessNode> result = processTenantService.addVersion(processTenant);
-        return R.data(result);
+    public R addVersion(@RequestBody NodeDetailsVo nodeDetailsVo) {
+        processTenantService.addVersion(nodeDetailsVo);
+        return R.success();
     }
 
     /**

hx-common/service-flow/src/main/java/com/fjhx/service/process/ProcessTenantService.java

@@ -2,8 +2,8 @@ package com.fjhx.service.process;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
-import com.fjhx.entity.process.ProcessNode;
 import com.fjhx.entity.process.ProcessTenant;
+import com.fjhx.params.NodeDetailsVo;
 
 import java.util.List;
 import java.util.Map;
@@ -22,7 +22,7 @@ public interface ProcessTenantService extends BaseService<ProcessTenant> {
 
     void add(ProcessTenant processTenant);
 
-    List<ProcessNode> addVersion(ProcessTenant processTenant);
+    void addVersion(NodeDetailsVo nodeDetailsVo);
 
     List<ProcessTenant> getVersionByProcessInfoId(ProcessTenant processTenant);
 

hx-common/service-flow/src/main/java/com/fjhx/service/process/impl/ProcessTenantServiceImpl.java

@@ -97,12 +97,12 @@ public class ProcessTenantServiceImpl extends ServiceImpl<ProcessTenantMapper, P
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public List<ProcessNode> addVersion(ProcessTenant processTenant) {
+    public void addVersion(NodeDetailsVo nodeDetailsVo) {
 
         // 查询流程最大版本信息
         ProcessTenant newProcessTenant = getOne(Wrappers.<ProcessTenant>lambdaQuery()
-                .eq(ProcessTenant::getProcessInfoId, processTenant.getProcessInfoId())
-                .eq(ProcessTenant::getBindingTenantId, processTenant.getBindingTenantId())
+                .eq(ProcessTenant::getProcessInfoId, nodeDetailsVo.getProcessInfoId())
+                .eq(ProcessTenant::getBindingTenantId, nodeDetailsVo.getProcessTenantId())
                 .orderByDesc(ProcessTenant::getVersionNumber)
                 .last("limit 1")
         );
@@ -117,8 +117,9 @@ public class ProcessTenantServiceImpl extends ServiceImpl<ProcessTenantMapper, P
         // 保存数据
         save(newProcessTenant);
 
-        // 生成默认节点
-        return createProcess(newProcessTenant.getId());
+        // 生成节点
+        processNodeButtonService.insertNodeButton(nodeDetailsVo);
+
     }
 
     @Override
@@ -147,7 +148,7 @@ public class ProcessTenantServiceImpl extends ServiceImpl<ProcessTenantMapper, P
     /**
      * 生成默认流程
      */
-    private List<ProcessNode> createProcess(Long processTenantId) {
+    private void createProcess(Long processTenantId) {
 
         // 生成默认开始节点
         ProcessNode startProcessNode = new ProcessNode();
@@ -173,7 +174,6 @@ public class ProcessTenantServiceImpl extends ServiceImpl<ProcessTenantMapper, P
         nodeDetailsVo.setProcessNodeList(processNodeList);
 
         processNodeButtonService.insertNodeButton(nodeDetailsVo);
-        return processNodeList;
     }
 
 }

hx-service-api/service-flow-api/src/main/java/com/fjhx/params/NodeDetailsVo.java

@@ -9,6 +9,11 @@ import java.util.List;
 public class NodeDetailsVo {
 
     /**
+     * 流程id
+     */
+    private Long processInfoId;
+
+    /**
      * 租户流程id
      */
     private Long processTenantId;