流程优化

bladex/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserSearchClient.java

@@ -71,6 +71,7 @@ public class UserSearchClient implements IUserSearchClient {
     }
 
     @Override
+    @GetMapping(GET_USER_NAME_AND_POST_BY_USER_ID)
     public R<Map<Long, Map<String, Object>>> getUserNameAndPostByUserId(List<Long> userIdList) {
         return R.data(service.getUserNameAndPostByUserId(userIdList));
     }

hx-common/service-flow/src/main/java/com/fjhx/service/example/impl/ExampleInfoServiceImpl.java

@@ -125,9 +125,11 @@ public class ExampleInfoServiceImpl extends ServiceImpl<ExampleInfoMapper, Examp
             List<ProcessNode> processNodes = parentProcessNodeMap.get(nextNode.getId());
             if (processNodes != null && processNodes.size() == 1) {
                 nextNode = processNodes.get(0);
+            } else {
+                nextNode = null;
             }
         }
 
-        return null;
+        return result;
     }
 }

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

@@ -1,14 +0,0 @@
-package com.fjhx.params;
-
-import com.fjhx.entity.example.ExampleDetails;
-import com.fjhx.entity.example.ExampleInfo;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class ExampleInfoEx extends ExampleInfo {
-
-    private ExampleDetails exampleDetails;
-
-}

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

@@ -1,44 +0,0 @@
-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;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 流程信息
- */
-@EqualsAndHashCode(callSuper = true)
-public class FlowInfoVo extends ProcessInfo {
-
-    /**
-     * 租户流程信息
-     */
-    @Getter
-    @Setter
-    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/FlowVo.java

@@ -0,0 +1,23 @@
+package com.fjhx.params;
+
+import lombok.Data;
+
+@Data
+public class FlowVo {
+
+    /**
+     * 流程关联编号
+     */
+    Long flowLinkNo;
+
+    /**
+     * 按钮id
+     */
+    Long buttonId;
+
+    /**
+     * 审批意见
+     */
+    String remarks;
+
+}

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

@@ -1,23 +0,0 @@
-package com.fjhx.params;
-
-import lombok.Data;
-
-@Data
-public class GetNodeButtonVo {
-
-    /**
-     * 租户id
-     */
-    private Long processTenantId;
-
-    /**
-     * 节点编码
-     */
-    private String nodeCode;
-
-    /**
-     * 节点按钮id
-     */
-    private Long buttonId;
-
-}

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

@@ -9,7 +9,6 @@ public abstract class ExampleAbstract {
     /**
      * 流程缓存值
      */
-    @Setter
     protected String cacheData;
 
     /**
@@ -22,6 +21,10 @@ public abstract class ExampleAbstract {
         return JSONObject.parseObject(cacheData, cls);
     }
 
+    protected void setCacheData(String cacheData) {
+        this.cacheData = cacheData;
+    }
+
     /**
      * 设置流程编码
      */

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

@@ -9,6 +9,7 @@ import com.fjhx.entity.process.ProcessNodeButton;
 import com.fjhx.enums.ButtonNameEnum;
 import com.fjhx.feign.IFlowClient;
 import com.fjhx.params.ExampleResult;
+import com.fjhx.params.FlowVo;
 import com.fjhx.params.JumpVo;
 import org.springblade.core.tool.api.R;
 
@@ -87,6 +88,10 @@ public class FlowConstructor {
         return result;
     }
 
+    public ExampleResult jump(FlowVo flowVo) {
+        return jump(flowVo.getFlowLinkNo(), flowVo.getButtonId(), flowVo.getRemarks(), null);
+    }
+
     /**
      * 流程跳转
      *
@@ -186,5 +191,4 @@ public class FlowConstructor {
         return code;
     }
 
-
 }

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/common/CommonFile.java

@@ -1,12 +1,9 @@
 package com.fjhx.entity.common;
 
-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.fjhx.base.StorageBaseEntity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.StorageBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/supplier/SupplierBank.java

@@ -1,12 +1,9 @@
 package com.fjhx.entity.supplier;
 
-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.fjhx.base.StorageBaseEntity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.StorageBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/supplier/SupplierKeep.java

@@ -1,12 +1,9 @@
 package com.fjhx.entity.supplier;
 
-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.fjhx.base.StorageBaseEntity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.StorageBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

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

@@ -45,46 +45,73 @@ public class CommonFileController {
     }
 
 
-    private FlowConstructor flowConstructor = FlowConstructor.init(
-
-            new ExampleAbstract() {
-                @Override
-                public String getCode() {
-                    return "test";
-                }
-
-                @Override
-                public void end() {
-                    ExampleInfo cacheData = getCacheData(ExampleInfo.class);
-                    System.err.println("缓存     " + cacheData);
-                    System.err.println("流程结束了");
-                }
-
-            }
-    );
-
-
-    @GetMapping("test")
-    public R test() {
-        HashMap<String, String> map = new HashMap<>();
-        map.put("processInfoId", "1111111111111111111111");
-        map.put("processTenantId", "222222222222222222222");
-        ExampleResult result = flowConstructor.create(123456L, "测试开始流程", map);
-        return R.success(result);
-    }
-
-
-    @GetMapping("jump")
-    public R jump(@RequestParam("buttonId") Long buttonId) {
-
-
-        flowConstructor.jump(123456L, buttonId, "测试流程运行", null).after(() -> {
-
-            int i = 1 / 0;
-
-        });
-        return R.success();
-    }
+//    private FlowConstructor flowConstructor() {
+//        return FlowConstructor.init(
+//
+//                new ExampleAbstract() {
+//                    @Override
+//                    public String getCode() {
+//                        return "test";
+//                    }
+//
+//                    @Override
+//                    public void end() {
+//                        ExampleInfo cacheData = getCacheData(ExampleInfo.class);
+//                        System.err.println("缓存     " + cacheData);
+//
+//
+//                        System.err.println("流程结束了");
+//                    }
+//
+//                    @Override
+//                    public void reject(String code) {
+//                        System.out.println("已拒绝该流程");
+//                    }
+//
+//                    @Override
+//                    public String circulation(String code) {
+//                        switch (code) {
+//                            case "add":
+//                                return "addFlow";
+//                            case "remove":
+//                                return "removeFlow";
+//                        }
+//                        return super.circulation(code);
+//                    }
+//
+//                }
+//        );
+//    }
+//
+//
+//    @GetMapping("test")
+//    public R test() {
+//        HashMap<String, String> map = new HashMap<>();
+//        map.put("processInfoId", "1111111111111111111111");
+//        map.put("processTenantId", "222222222222222222222");
+//
+//
+//        ExampleResult result = flowConstructor().create(123456L, "测试开始流程", map);
+//
+//        result.after(() -> {
+//
+//
+//        });
+//
+//        return R.success(result);
+//    }
+//
+//
+//    @GetMapping("jump")
+//    public R jump(@RequestParam("buttonId") Long buttonId) {
+//
+//        flowConstructor().jump(123456L, buttonId, "测试流程运行", null).after(() -> {
+//
+//            int i = 1 / 0;
+//
+//        });
+//        return R.success();
+//    }
 
 }
 

hx-service/storage-restructure/src/main/java/com/fjhx/controller/material/MaterialController.java

@@ -2,7 +2,8 @@ package com.fjhx.controller.material;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.material.Material;
-import com.fjhx.params.material.MaterialVo;
+import com.fjhx.params.FlowVo;
+import com.fjhx.service.flow.MaterialUpdateFlowService;
 import com.fjhx.service.material.MaterialService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,15 +29,30 @@ public class MaterialController {
     @Autowired
     private MaterialService materialService;
 
+    @Autowired
+    private MaterialUpdateFlowService materialUpdateFlowService;
+
     @PostMapping("/page")
     public R page(@RequestBody Map<String, String> condition) {
         Page<Material> result = materialService.getPage(condition);
         return R.success(result);
     }
 
-    @PostMapping("/edit")
-    public R edit(@RequestBody MaterialVo materialVo) {
-        materialService.edit(materialVo);
+    /**
+     * 物料修改创建流程
+     */
+    @PostMapping("/editFlowCreate")
+    public R editFlowCreate(@RequestBody Material material) {
+        materialUpdateFlowService.create(material);
+        return R.success();
+    }
+
+    /**
+     * 物料修改流程跳转
+     */
+    @PostMapping("/editFlowJump")
+    public R editFlowJump(@RequestBody FlowVo flowVo) {
+        materialUpdateFlowService.jump(flowVo);
         return R.success();
     }
 

hx-service/storage-restructure/src/main/java/com/fjhx/service/common/impl/CommonFileServiceImpl.java

@@ -58,7 +58,7 @@ public class CommonFileServiceImpl extends ServiceImpl<CommonFileMapper, CommonF
         map.put("filePath", filePath);
         map.put("id", fileInfo.getId().toString());
 
-        return null;
+        return map;
     }
 
     @Override

hx-service/storage-restructure/src/main/java/com/fjhx/service/flow/MaterialUpdateFlowService.java

@@ -0,0 +1,45 @@
+package com.fjhx.service.flow;
+
+import com.fjhx.entity.material.Material;
+import com.fjhx.params.FlowVo;
+import com.fjhx.service.material.MaterialService;
+import com.fjhx.utils.ExampleAbstract;
+import com.fjhx.utils.FlowConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 物料修改审批
+ */
+@Service
+public class MaterialUpdateFlowService {
+
+    @Autowired
+    private MaterialService materialService;
+
+    private FlowConstructor getFlowConstructor() {
+        return FlowConstructor.init(new ExampleAbstract() {
+
+            @Override
+            public String getCode() {
+                return "js_materialCode";
+            }
+
+            @Override
+            public void end() {
+                Material material = getCacheData(Material.class);
+                materialService.updateById(material);
+            }
+
+        });
+    }
+
+    public void create(Material material) {
+        getFlowConstructor().create(material.getId(), "物料修改", material);
+    }
+
+    public void jump(FlowVo flowVo) {
+        getFlowConstructor().jump(flowVo);
+    }
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/service/material/MaterialService.java

@@ -1,9 +1,8 @@
 package com.fjhx.service.material;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.material.Material;
-import com.fjhx.params.material.MaterialVo;
 import com.fjhx.base.StorageBaseService;
+import com.fjhx.entity.material.Material;
 
 import java.util.Map;
 
@@ -19,8 +18,6 @@ public interface MaterialService extends StorageBaseService<Material> {
 
     Page<Material> getPage(Map<String, String> condition);
 
-    void edit(MaterialVo materialVo);
-
     String getDelayPeriod();
 
     void setDelayPeriod(Map<String, Integer> condition);

hx-service/storage-restructure/src/main/java/com/fjhx/service/material/impl/MaterialServiceImpl.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.constants.common.ConfigConstant;
 import com.fjhx.entity.material.Material;
 import com.fjhx.mapper.material.MaterialMapper;
-import com.fjhx.params.material.MaterialVo;
 import com.fjhx.service.common.CommonConfigService;
 import com.fjhx.service.material.MaterialService;
 import com.fjhx.utils.WrapperUtil;
@@ -45,11 +44,6 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
     }
 
     @Override
-    public void edit(MaterialVo materialVo) {
-        updateById(materialVo);
-    }
-
-    @Override
     public String getDelayPeriod() {
         return commonConfigService.getValue(ConfigConstant.DELAY_PERIOD);
     }