发起流程

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

@@ -1,18 +1,10 @@
 package com.fjhx.controller.example;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.tool.api.R;
-import com.fjhx.entity.example.ExampleInfo;
-import com.fjhx.params.example.ExampleInfoVo;
 import com.fjhx.service.example.ExampleInfoService;
 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;
 
-import java.util.Map;
-
 /**
  * <p>
  * 流程实例 前端控制器

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

@@ -34,7 +34,7 @@ public class ProcessInfoController {
     @PostMapping("/list")
     public R list(@RequestBody Map<String, String> condition) {
         List<ProcessInfo> list = processInfoService.getList(condition);
-        return R.success(list);
+        return R.data(list);
     }
 
     /**
@@ -43,7 +43,7 @@ public class ProcessInfoController {
     @PostMapping("/page")
     public R page(@RequestBody Map<String, String> condition) {
         Page<ProcessInfo> page = processInfoService.getPage(condition);
-        return R.success(page);
+        return R.data(page);
     }
 
     /**
@@ -60,7 +60,7 @@ public class ProcessInfoController {
      */
     @PostMapping("/serviceNameList")
     public R serviceNameList() {
-        return R.success(processInfoService.getDistinctList(ProcessInfo::getServiceName));
+        return R.data(processInfoService.getDistinctList(ProcessInfo::getServiceName));
     }
 
 }

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

@@ -2,7 +2,7 @@ package com.fjhx.controller.process;
 
 import com.fjhx.entity.process.ProcessNode;
 import com.fjhx.entity.process.ProcessNodeButton;
-import com.fjhx.params.process.ProcessNodeVo;
+import com.fjhx.params.ProcessNodeVo;
 import com.fjhx.service.process.ProcessNodeButtonService;
 import com.fjhx.service.process.ProcessNodeService;
 import org.springblade.core.tool.api.R;
@@ -36,7 +36,7 @@ public class ProcessNodeController {
     @PostMapping("/add")
     public R add(@RequestBody ProcessNodeVo processNodeVo) {
         processNodeService.add(processNodeVo);
-        return R.success(processNodeVo);
+        return R.data(processNodeVo);
     }
 
     /**

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

@@ -35,7 +35,7 @@ public class ProcessTenantController {
     @PostMapping("/page")
     public R page(@RequestBody Map<String, String> condition) {
         Page<Map<String, Object>> result = processTenantService.getPage(condition);
-        return R.success(result);
+        return R.data(result);
     }
 
     /**
@@ -53,7 +53,7 @@ public class ProcessTenantController {
     @PostMapping("/addVersion")
     public R addVersion(@RequestBody ProcessTenant processTenant) {
         List<ProcessNode> result = processTenantService.addVersion(processTenant);
-        return R.success(result);
+        return R.data(result);
     }
 
     /**
@@ -62,7 +62,7 @@ public class ProcessTenantController {
     @PostMapping("/getVersionByProcessInfoId")
     public R getVersionByProcessInfoId(@RequestBody ProcessTenant processTenant) {
         List<ProcessTenant> result = processTenantService.getVersionByProcessInfoId(processTenant);
-        return R.success(result);
+        return R.data(result);
     }
 
     /**

hx-common/service-flow/src/main/java/com/fjhx/feign/FlowClient.java

@@ -1,5 +1,6 @@
 package com.fjhx.feign;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.constants.FlowExplainConstant;
 import com.fjhx.constants.StatusConstant;
@@ -7,6 +8,7 @@ import com.fjhx.entity.example.ExampleInfo;
 import com.fjhx.entity.process.ProcessInfo;
 import com.fjhx.entity.process.ProcessNodeButton;
 import com.fjhx.entity.process.ProcessTenant;
+import com.fjhx.params.FlowInfo;
 import com.fjhx.service.example.ExampleInfoService;
 import com.fjhx.service.process.ProcessInfoService;
 import com.fjhx.service.process.ProcessNodeButtonService;
@@ -34,49 +36,51 @@ public class FlowClient implements IFlowClient {
     private ProcessNodeButtonService processNodeButtonService;
 
 
-    @PostMapping(GET_PROCESS_TENANT)
+    @PostMapping(GET_FLOW_INFO)
     @Override
-    public R<ProcessTenant> getProcessTenant(Long businessId, String code) {
+    public R<FlowInfo> getProcessTenant(Long businessId, String code) {
 
-        ExampleInfo exampleInfo = exampleInfoService.getOne(Wrappers.<ExampleInfo>lambdaQuery()
-                .eq(ExampleInfo::getBusinessId, businessId).eq(ExampleInfo::getComplete, StatusConstant.No));
+        ExampleInfo exampleInfo = exampleInfoService.getOne(
+                Wrappers.<ExampleInfo>lambdaQuery()
+                        .eq(ExampleInfo::getBusinessId, businessId)
+                        .eq(ExampleInfo::getComplete, StatusConstant.No));
 
         Assert.empty(exampleInfo, FlowExplainConstant.EXPLAIN_NOT_EXIST);
 
         // 查找通用流程
         ProcessInfo processInfo = processInfoService.getOne(ProcessInfo::getCode, code);
         Assert.notEmpty(processInfo, String.format(FlowExplainConstant.PROCESS_NOT_EXIST, code));
-        Long processInfoId = processInfo.getId();
+
+        FlowInfo flowInfo = BeanUtil.toBean(processInfo, FlowInfo.class);
 
         // 获取租户流程
         ProcessTenant processTenant = processTenantService.getOne(Wrappers.<ProcessTenant>lambdaQuery()
-                .eq(ProcessTenant::getProcessInfoId, processInfoId)
+                .eq(ProcessTenant::getProcessInfoId, processInfo.getId())
                 .eq(ProcessTenant::getBindingTenantId, AuthUtil.getTenantId())
                 .eq(ProcessTenant::getCurrentVersion, StatusConstant.YES));
 
-        if (processTenant == null) {
-            processTenant = new ProcessTenant();
-            processTenant.setProcessInfoId(processInfo.getId());
-        }
+        flowInfo.setProcessTenant(processTenant);
 
-        return R.success(processTenant);
+        return R.data(flowInfo);
     }
 
-    @PostMapping(GET_PROCESS_NODE_BUTTON_BY_PROCESS_TENANT_ID)
+    @PostMapping(GET_JUMP_NODE_ID)
     @Override
-    public R<ProcessNodeButton> getProcessNodeButtonByProcessTenantId(Long processTenantId, String processNodeCode) {
+    public R<Long> getJumpNodeId(Long processTenantId, String processNodeCode) {
         ProcessNodeButton processNodeButton = processNodeButtonService.getOne(
                 Wrappers.<ProcessNodeButton>lambdaQuery()
                         .eq(ProcessNodeButton::getProcessTenantId, processTenantId)
                         .eq(ProcessNodeButton::getProcessNodeCode, processNodeCode));
-        return R.success(processNodeButton);
+
+        Assert.notEmpty(processNodeButton, FlowExplainConstant.SPECIFY_BRANCH_EMPTY);
+        return R.data(processNodeButton.getJumpNodeId());
     }
 
     @PostMapping(EXAMPLE_INFO_SAVE)
     @Override
     public R<ExampleInfo> exampleInfoSave(ExampleInfo exampleInfo) {
         exampleInfoService.save(exampleInfo);
-        return R.success(exampleInfo);
+        return R.data(exampleInfo);
     }
 
 }

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

@@ -2,7 +2,7 @@ package com.fjhx.service.process;
 
 import com.fjhx.base.BaseService;
 import com.fjhx.entity.process.ProcessNode;
-import com.fjhx.params.process.ProcessNodeVo;
+import com.fjhx.params.ProcessNodeVo;
 
 /**
  * <p>

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

@@ -6,7 +6,7 @@ import com.fjhx.constants.FlowExplainConstant;
 import com.fjhx.entity.process.ProcessNode;
 import com.fjhx.enums.ProcessNodeHandleObjectTypeEnum;
 import com.fjhx.mapper.process.ProcessNodeMapper;
-import com.fjhx.params.process.ProcessNodeVo;
+import com.fjhx.params.ProcessNodeVo;
 import com.fjhx.service.process.ProcessNodeService;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.FileClientUtil;

hx-service-api/service-flow-api/src/main/java/com/fjhx/constants/FlowExplainConstant.java

@@ -51,6 +51,6 @@ public interface FlowExplainConstant {
 
     String EXPLAIN_NOT_EXIST = "流程已发起";
 
-    String SPECIFY_BRANCH_EMPTY = "没有找到指定流转的分支";
+    String SPECIFY_BRANCH_EMPTY = "没有找到指定流转节点";
 
 }

hx-service-api/service-flow-api/src/main/java/com/fjhx/entity/example/ExampleInfo.java

@@ -1,12 +1,9 @@
 package com.fjhx.entity.example;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -22,7 +19,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class ExampleInfo extends BaseEntity {
 
-
     /**
      * 流程id
      */
@@ -60,5 +56,4 @@ public class ExampleInfo extends BaseEntity {
     @TableLogic
     private Integer delFlag;
 
-
 }

hx-service-api/service-flow-api/src/main/java/com/fjhx/feign/IFlowClient.java

@@ -2,8 +2,7 @@ package com.fjhx.feign;
 
 import com.fjhx.constants.ClientConstant;
 import com.fjhx.entity.example.ExampleInfo;
-import com.fjhx.entity.process.ProcessNodeButton;
-import com.fjhx.entity.process.ProcessTenant;
+import com.fjhx.params.FlowInfo;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,23 +15,21 @@ import org.springframework.web.bind.annotation.RequestParam;
 @FeignClient(value = "service-flow")
 public interface IFlowClient {
 
-    String GET_PROCESS_TENANT = ClientConstant.API_PREFIX + "/getProcessTenant";
-    String GET_PROCESS_NODE_BUTTON_BY_PROCESS_TENANT_ID = ClientConstant.API_PREFIX + "/getProcessNodeButtonByProcessTenantId";
+    String GET_FLOW_INFO = ClientConstant.API_PREFIX + "/getFlowInfo";
+    String GET_JUMP_NODE_ID = ClientConstant.API_PREFIX + "/getJumpNodeId";
     String EXAMPLE_INFO_SAVE = ClientConstant.API_PREFIX + "/exampleInfoSave";
 
     /**
-     * 通过流程编码获取租户流程
+     * 通过流程编码获取流程信息
      */
-    @PostMapping(GET_PROCESS_TENANT)
-    R<ProcessTenant> getProcessTenant(@RequestParam("businessId") Long businessId, @RequestParam("code") String code);
+    @PostMapping(GET_FLOW_INFO)
+    R<FlowInfo> getProcessTenant(@RequestParam("businessId") Long businessId, @RequestParam("code") String code);
 
     /**
-     * 通过租户业务流程id获取开始节点按钮信息
+     * 通过业务id和节点编码获取下一节点id
      */
-    @PostMapping(GET_PROCESS_NODE_BUTTON_BY_PROCESS_TENANT_ID)
-    R<ProcessNodeButton> getProcessNodeButtonByProcessTenantId(
-            @RequestParam("businessId") Long businessId,
-            @RequestParam("processNodeCode") String processNodeCode);
+    @PostMapping(GET_JUMP_NODE_ID)
+    R<Long> getJumpNodeId(@RequestParam("businessId") Long businessId, @RequestParam("processNodeCode") String processNodeCode);
 
     /**
      * 保存流程实例

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

@@ -0,0 +1,40 @@
+package com.fjhx.params;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.fjhx.entity.process.ProcessInfo;
+import com.fjhx.entity.process.ProcessTenant;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 流程信息
+ */
+@EqualsAndHashCode(callSuper = true)
+public class FlowInfo extends ProcessInfo {
+
+    /**
+     * 租户流程信息
+     */
+    private String processTenantStr;
+
+    /**
+     * 获取租户流程信息
+     */
+    public ProcessTenant processTenantEntity() {
+        if (ObjectUtil.isEmpty(processTenantStr)) {
+            return null;
+        }
+        return JSONObject.parseObject(this.processTenantStr, ProcessTenant.class);
+    }
+
+    /**
+     * 赋值租户流程信息
+     */
+    public void setProcessTenant(ProcessTenant processTenant) {
+        if (ObjectUtil.isNotEmpty(processTenant)) {
+            this.processTenantStr = JSONObject.toJSONString(processTenant);
+        }
+    }
+
+
+}

hx-service-api/service-flow-api/src/main/java/com/fjhx/params/process/ProcessNodeVo.java → hx-service-api/service-flow-api/src/main/java/com/fjhx/params/ProcessNodeVo.java

@@ -1,4 +1,4 @@
-package com.fjhx.params.process;
+package com.fjhx.params;
 
 import com.fjhx.entity.FileInfo;
 import com.fjhx.entity.process.ProcessNode;

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

@@ -1,17 +0,0 @@
-package com.fjhx.params.example;
-
-import com.fjhx.entity.example.ExampleInfo;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 流程实例
- *
- * @author ${author}
- * @since 2022-08-18
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ExampleInfoEx extends ExampleInfo {
-
-}

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

@@ -1,17 +0,0 @@
-package com.fjhx.params.example;
-
-import com.fjhx.entity.example.ExampleInfo;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 流程实例
- *
- * @author ${author}
- * @since 2022-08-18
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ExampleInfoVo extends ExampleInfo {
-
-}

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

@@ -1,21 +0,0 @@
-package com.fjhx.params.process;
-
-import com.fjhx.entity.process.ProcessNode;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class SaveNodeListVo {
-
-    /**
-     * 流程节点id
-     */
-    private Long id;
-
-    /**
-     * 节点列表
-     */
-    private List<ProcessNode> processNodeList;
-
-}

hx-service-api/service-flow-api/src/main/java/com/fjhx/utils/ExampleAbstract.java

@@ -10,23 +10,17 @@ public abstract class ExampleAbstract {
      * 流程缓存值
      */
     @Setter
-    private String cacheData;
+    protected Object cacheData;
 
     /**
      * 获取缓存值
      */
-    public <T> T getCacheData() {
+    public <T> T getCacheData(Class<T> cls) {
         if (ObjectUtil.isEmpty(cacheData)) {
             return null;
         }
-        return (T) JSONObject.parseObject(cacheData);
-    }
-
-    public void setCacheData(Object cacheData) {
-        if (ObjectUtil.isEmpty(cacheData)) {
-            return;
-        }
-        this.cacheData = JSONObject.toJSONString(cacheData);
+        String jsonString = JSONObject.toJSONString(cacheData);
+        return JSONObject.parseObject(jsonString, cls);
     }
 
     /**
@@ -40,7 +34,7 @@ public abstract class ExampleAbstract {
     public abstract void end();
 
     /**
-     * 审批不通过方法
+     * 审批不通过方法(直接结束流程)
      * 需要时重写即可
      *
      * @param code 节点编码
@@ -57,7 +51,7 @@ public abstract class ExampleAbstract {
      * @return 指定流转分支编码
      */
     public String circulation(String code) {
-        return null;
+        return code;
     }
 
 

hx-service-api/service-flow-api/src/main/java/com/fjhx/utils/FlowConstructor.java

@@ -2,13 +2,14 @@ package com.fjhx.utils;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.fjhx.constants.FlowConstant;
 import com.fjhx.constants.FlowExplainConstant;
 import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.example.ExampleInfo;
-import com.fjhx.entity.process.ProcessNodeButton;
 import com.fjhx.entity.process.ProcessTenant;
 import com.fjhx.feign.IFlowClient;
+import com.fjhx.params.FlowInfo;
 import org.springblade.core.tool.api.R;
 
 public class FlowConstructor {
@@ -38,28 +39,24 @@ public class FlowConstructor {
      */
     public ExampleInfo create(Long businessId) {
 
-
         // 获取流程编码
         String code = exampleAbstract.getCode();
         Assert.notEmpty(code, FlowExplainConstant.CODE_EMPTY);
 
         // 获取租户流程
-        R<ProcessTenant> r = flowClient.getProcessTenant(businessId, code);
+        R<FlowInfo> r = flowClient.getProcessTenant(businessId, code);
         Assert.eqTrue(r.isSuccess(), r.getMsg());
-
-        ProcessTenant processTenant = r.getData();
-
-        Long processInfoId = processTenant.getProcessInfoId();
+        FlowInfo flowInfo = r.getData();
 
         // 创建流程实例
         ExampleInfo exampleInfo = new ExampleInfo();
-        exampleInfo.setProcessInfoId(processInfoId);
+        exampleInfo.setProcessInfoId(flowInfo.getId());
         exampleInfo.setBusinessId(businessId);
-        exampleInfo.setCacheData(exampleAbstract.getCacheData());
+        exampleInfo.setCacheData(JSONObject.toJSONString(exampleAbstract.cacheData));
 
         // 如果租户流程为空,直接完成流程
-        if (ObjectUtil.isEmpty(processTenant.getId())) {
-
+        ProcessTenant processTenant = flowInfo.processTenantEntity();
+        if (ObjectUtil.isEmpty(processTenant)) {
             exampleInfo.setProcessNodeId(FlowConstant.OVER_PROCESS_FLAG);
             exampleInfo.setComplete(StatusConstant.YES);
 
@@ -73,35 +70,33 @@ public class FlowConstructor {
             // 赋值租户流程id
             exampleInfo.setProcessTenantId(processTenantId);
 
-            ProcessNodeButton processNodeButton;
-
             // 调用方法查看是否有指定跳转节点,没有则正常流转
             String circulation = exampleAbstract.circulation(FlowConstant.START_CODE);
-            if (ObjectUtil.isNotEmpty(circulation)) {
-                processNodeButton = flowClient.getProcessNodeButtonByProcessTenantId(processTenantId, circulation).getData();
-            } else {
-                processNodeButton = flowClient.getProcessNodeButtonByProcessTenantId(processTenantId, FlowConstant.START_CODE).getData();
-            }
+            R<Long> getJumpNodeIdResult = flowClient.getJumpNodeId(processTenantId, circulation);
+            Assert.eqTrue(r.isSuccess(), r.getMsg());
+
+            // 流转节点
+            Long jumpNodeId = getJumpNodeIdResult.getData();
 
-            Long jumpNodeId = processNodeButton.getJumpNodeId();
             // 流程结束
             if (jumpNodeId.equals(FlowConstant.OVER_PROCESS_FLAG)) {
                 exampleInfo.setComplete(StatusConstant.YES);
-                // 执行流程结束方法
                 exampleAbstract.end();
             }
-            // 否则正常流转
+            // 正常流转到下一节点
             else {
                 exampleInfo.setComplete(StatusConstant.No);
             }
 
             // 赋值跳转节点id
-            Assert.notEmpty(jumpNodeId, FlowExplainConstant.SPECIFY_BRANCH_EMPTY);
             exampleInfo.setProcessNodeId(jumpNodeId);
         }
 
         // 保存流程实例
-        return flowClient.exampleInfoSave(exampleInfo).getData();
+        R<ExampleInfo> exampleInfoResult = flowClient.exampleInfoSave(exampleInfo);
+        Assert.eqTrue(r.isSuccess(), r.getMsg());
+
+        return exampleInfoResult.getData();
     }
 
 

hx-service/storage-restructure/src/main/java/com/fjhx/controller/common/CommonFileController.java

@@ -47,6 +47,7 @@ public class CommonFileController {
     public R test() {
 
         ExampleAbstract exampleAbstract = new ExampleAbstract() {
+
             @Override
             public String getCode() {
                 return "test";
@@ -54,17 +55,17 @@ public class CommonFileController {
 
             @Override
             public void end() {
-//                ExampleInfo cacheData = getCacheData();
-//                System.out.println("缓存     " + cacheData);
-                System.out.println("流程结束了");
+                ExampleInfo cacheData = getCacheData(ExampleInfo.class);
+                System.err.println("缓存     " + cacheData);
+                System.err.println("流程结束了");
             }
 
         };
 
-//        HashMap<String, String> map = new HashMap<>();
-//        map.put("processInfoId", "1111111111111111111111");
-//        map.put("processTenantId", "222222222222222222222");
-//        exampleAbstract.setCacheData(map);
+        HashMap<String, String> map = new HashMap<>();
+        map.put("processInfoId", "1111111111111111111111");
+        map.put("processTenantId", "222222222222222222222");
+        exampleAbstract.setCacheData(map);
 
         FlowConstructor.init(exampleAbstract).create(123456L);