流程

hx-common/library-product/src/main/java/com/fjhx/constant/LibraryProductLockConstant.java → hx-common/library-product/src/main/java/com/fjhx/constants/LibraryProductLockConstant.java

@@ -1,4 +1,4 @@
-package com.fjhx.constant;
+package com.fjhx.constants;
 
 /**
  * 锁常量

hx-common/library-product/src/main/java/com/fjhx/service/impl/MaterialServiceImpl.java

@@ -3,7 +3,7 @@ package com.fjhx.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseEntity;
-import com.fjhx.constant.LibraryProductLockConstant;
+import com.fjhx.constants.LibraryProductLockConstant;
 import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.entity.Material;
 import com.fjhx.mapper.MaterialMapper;

hx-common/library-product/src/main/java/com/fjhx/service/impl/ProductServiceImpl.java

@@ -3,7 +3,7 @@ package com.fjhx.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseEntity;
-import com.fjhx.constant.LibraryProductLockConstant;
+import com.fjhx.constants.LibraryProductLockConstant;
 import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.entity.Product;
 import com.fjhx.mapper.ProductMapper;

hx-common/library-storage/src/main/java/com/fjhx/constant/LibraryStorageLockConstant.java → hx-common/library-storage/src/main/java/com/fjhx/constants/LibraryStorageLockConstant.java

@@ -1,4 +1,4 @@
-package com.fjhx.constant;
+package com.fjhx.constants;
 
 /**
  * 锁常量

hx-common/library-storage/src/main/java/com/fjhx/constant/StockJournalTypeConstant.java → hx-common/library-storage/src/main/java/com/fjhx/constants/StockJournalTypeConstant.java

@@ -1,4 +1,4 @@
-package com.fjhx.constant;
+package com.fjhx.constants;
 
 /**
  * 出入库类型

hx-common/library-storage/src/main/java/com/fjhx/constant/WarehouseTypeConstant.java → hx-common/library-storage/src/main/java/com/fjhx/constants/WarehouseTypeConstant.java

@@ -1,4 +1,4 @@
-package com.fjhx.constant;
+package com.fjhx.constants;
 
 /**
  * 仓库类型

hx-common/library-storage/src/main/java/com/fjhx/service/StockJournalService.java

@@ -1,7 +1,7 @@
 package com.fjhx.service;
 
 import com.fjhx.base.BaseService;
-import com.fjhx.constant.StockJournalTypeConstant;
+import com.fjhx.constants.StockJournalTypeConstant;
 import com.fjhx.entity.StockJournal;
 
 import java.math.BigDecimal;

hx-common/library-storage/src/main/java/com/fjhx/service/impl/StockServiceImpl.java

@@ -1,8 +1,8 @@
 package com.fjhx.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.constant.LibraryStorageLockConstant;
-import com.fjhx.constant.StockJournalTypeConstant;
+import com.fjhx.constants.LibraryStorageLockConstant;
+import com.fjhx.constants.StockJournalTypeConstant;
 import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.entity.Stock;
 import com.fjhx.mapper.StockMapper;

hx-common/library-storage/src/main/java/com/fjhx/service/impl/WarehouseServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseEntity;
-import com.fjhx.constant.WarehouseTypeConstant;
+import com.fjhx.constants.WarehouseTypeConstant;
 import com.fjhx.entity.Warehouse;
 import com.fjhx.mapper.WarehouseMapper;
 import com.fjhx.service.WarehouseService;

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

@@ -1,8 +1,6 @@
 package com.fjhx.controller.process;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.process.ProcessInfo;
-import com.fjhx.params.process.ProcessInfoVo;
 import com.fjhx.service.process.ProcessInfoService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,8 +9,6 @@ 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>
  * 前端控制器
@@ -28,27 +24,12 @@ public class ProcessInfoController {
     @Autowired
     private ProcessInfoService processInfoService;
 
-    @PostMapping("/page")
-    public R page(@RequestBody Map<String, String> condition) {
-        Page<ProcessInfo> result = processInfoService.getPage(condition);
-        return R.success(result);
-    }
-
-    @PostMapping("/add")
-    public R add(@RequestBody ProcessInfoVo processInfoVo) {
-        processInfoService.add(processInfoVo);
-        return R.success();
-    }
-
-    @PostMapping("/edit")
-    public R edit(@RequestBody ProcessInfoVo processInfoVo) {
-        processInfoService.edit(processInfoVo);
-        return R.success();
-    }
-
-    @PostMapping("/delete")
-    public R delete(@RequestBody ProcessInfoVo processInfoVo) {
-        processInfoService.delete(processInfoVo);
+    /**
+     * 添加系统流程
+     */
+    @PostMapping("/addSystem")
+    public R addSystem(@RequestBody ProcessInfo processInfo) {
+        processInfoService.addSystem(processInfo);
         return R.success();
     }
 

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

@@ -1,11 +1,7 @@
 package com.fjhx.service.process;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
 import com.fjhx.entity.process.ProcessInfo;
-import com.fjhx.params.process.ProcessInfoVo;
-
-import java.util.Map;
 
 /**
  * <p>
@@ -17,12 +13,6 @@ import java.util.Map;
  */
 public interface ProcessInfoService extends BaseService<ProcessInfo> {
 
-    Page<ProcessInfo> getPage(Map<String, String> condition);
-
-    void add(ProcessInfoVo processInfoVo);
-
-    void edit(ProcessInfoVo processInfoVo);
-
-    void delete(ProcessInfoVo processInfoVo);
+    void addSystem(ProcessInfo processInfo);
 
 }

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

@@ -1,21 +1,21 @@
 package com.fjhx.service.process.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.constants.StatusConstant;
+import com.fjhx.constants.FlowExplainConstant;
+import com.fjhx.constants.ProcessConstant;
 import com.fjhx.entity.process.ProcessInfo;
+import com.fjhx.entity.process.ProcessNode;
+import com.fjhx.enums.ProcessNodeHandleObjectTypeEnum;
+import com.fjhx.enums.ProcessNodeTypeEnum;
 import com.fjhx.mapper.process.ProcessInfoMapper;
-import com.fjhx.params.process.ProcessInfoVo;
 import com.fjhx.service.process.ProcessInfoService;
+import com.fjhx.service.process.ProcessNodeService;
 import com.fjhx.utils.Assert;
-import com.fjhx.utils.WrapperUtil;
+import org.springblade.common.constant.CommonConstant;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Map;
 
 /**
  * <p>
@@ -28,50 +28,55 @@ import java.util.Map;
 @Service
 public class ProcessInfoServiceImpl extends ServiceImpl<ProcessInfoMapper, ProcessInfo> implements ProcessInfoService {
 
-    @Override
-    public Page<ProcessInfo> getPage(Map<String, String> condition) {
-
-        QueryWrapper<ProcessInfo> wrapper = Wrappers.query();
-
-        WrapperUtil.init(condition, wrapper)
-                .createTimeDesc();
+    @Autowired
+    private ProcessNodeService processNodeService;
 
-        Page<ProcessInfo> page = page(condition, wrapper);
-        return page;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
     @Override
-    public void add(ProcessInfoVo processInfoVo) {
-        // 编码
-        String code = processInfoVo.getCode();
-        Assert.notEmpty(code, "流程编码不能为空");
-
-        // 绑定租户id
-        String bindingTenantId = processInfoVo.getBindingTenantId();
-
-        // 最新版本号
-        Integer newestVersion = getNewestVersion(code, bindingTenantId);
+    public void addSystem(ProcessInfo processInfo) {
+        // 编码非空
+        String code = processInfo.getCode();
+        Assert.notEmpty(code, FlowExplainConstant.CODE_EMPTY);
 
-        // 如果最新版本号为1，赋值为当前版本
-        if (newestVersion == 1) {
-            processInfoVo.setCurrentVersion(StatusConstant.YES);
-        }
+        // 验证编码唯一性
+        Integer count = count(ProcessInfo::getCode, code);
+        Assert.eqZero(count, FlowExplainConstant.PROCESS_EXIST);
 
-        save(processInfoVo);
 
 
 
     }
 
-    @Override
-    public void edit(ProcessInfoVo processInfoVo) {
-        updateById(processInfoVo);
-    }
 
-    @Override
-    public void delete(ProcessInfoVo processInfoVo) {
-        removeById(processInfoVo.getId());
+    /**
+     * 生成默认流程
+     */
+    private void createProcess(ProcessInfo processInfo) {
+
+        // 保存流程
+        save(processInfo);
+
+        Long processInfoId = processInfo.getId();
+
+        // 生成默认开始节点
+        ProcessNode startProcessNode = new ProcessNode();
+        startProcessNode.setType(ProcessNodeTypeEnum.start.getType());
+        startProcessNode.setProcessInfoId(processInfoId);
+        startProcessNode.setParentId(CommonConstant.TOP_PARENT_ID);
+        startProcessNode.setName(ProcessConstant.START_NAME);
+        startProcessNode.setCode(ProcessConstant.START_CODE);
+        startProcessNode.setHandleObjectType(ProcessNodeHandleObjectTypeEnum.all.getType());
+        processNodeService.save(startProcessNode);
+
+        // 生成默认结束节点
+        Long startProcessNodeId = startProcessNode.getId();
+        ProcessNode endProcessNode = new ProcessNode();
+        endProcessNode.setType(ProcessNodeTypeEnum.end.getType());
+        endProcessNode.setProcessInfoId(processInfoId);
+        endProcessNode.setParentId(startProcessNodeId);
+        endProcessNode.setName(ProcessConstant.END_NAME);
+        endProcessNode.setCode(ProcessConstant.END_CODE);
+        processNodeService.save(endProcessNode);
+
     }
 
     /**
@@ -86,15 +91,16 @@ public class ProcessInfoServiceImpl extends ServiceImpl<ProcessInfoMapper, Proce
         ProcessInfo processInfo = getOne(Wrappers.<ProcessInfo>lambdaQuery()
                 .eq(ProcessInfo::getCode, code)
                 .eq(ObjectUtil.isNotEmpty(bindingTenantId), ProcessInfo::getBindingTenantId, bindingTenantId)
-                .orderByDesc(ProcessInfo::getParallelVersion)
+                .orderByDesc(ProcessInfo::getVersionNumber)
                 .last("limit 1")
         );
 
         if (processInfo == null) {
-            return 1;
+            return ProcessConstant.DEFAULT_VERSION_NUMBER;
         }
 
-        return processInfo.getParallelVersion() + 1;
+        return processInfo.getVersionNumber() + 1;
     }
 
+
 }

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

@@ -0,0 +1,12 @@
+package com.fjhx.constants;
+
+/**
+ * 流程说明
+ */
+public interface FlowExplainConstant {
+
+    String CODE_EMPTY = "编码不能为空";
+
+    String PROCESS_EXIST = "流程已存在";
+
+}

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

@@ -0,0 +1,33 @@
+package com.fjhx.constants;
+
+/**
+ * 节点常量
+ */
+public interface ProcessConstant {
+
+    /**
+     * 开始节点名称
+     */
+    String START_NAME = "开始";
+
+    /**
+     * 开始节点编码
+     */
+    String START_CODE = "start";
+
+    /**
+     * 结束节点名称
+     */
+    String END_NAME = "结束";
+
+    /**
+     * 结束节点编码
+     */
+    String END_CODE = "end";
+
+    /**
+     * 默认流程版本号
+     */
+    Integer DEFAULT_VERSION_NUMBER = 1;
+
+}

hx-service-api/service-flow-api/src/main/java/com/fjhx/entity/process/ProcessInfo.java

@@ -1,8 +1,10 @@
 package com.fjhx.entity.process;
 
-import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
 
 /**
  * <p>
@@ -13,9 +15,15 @@ import lombok.EqualsAndHashCode;
  * @since 2022-08-12
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class ProcessInfo extends BaseEntity {
+public class ProcessInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
 
     /**
      * 流程名称
@@ -50,12 +58,12 @@ public class ProcessInfo extends BaseEntity {
     /**
      * 版本号
      */
-    private Integer parallelVersion;
+    private Integer versionNumber;
 
     /**
      * 是否当前版本
      */
-    private Integer currentVersion;
+    private Integer current;
 
     /**
      * 绑定租户id 存在租户id，租户专属流程，不存在则为通用流程

hx-service-api/service-flow-api/src/main/java/com/fjhx/entity/process/ProcessNode.java

@@ -1,25 +1,29 @@
 package com.fjhx.entity.process;
 
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fjhx.base.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author ${author}
  * @since 2022-08-12
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class ProcessNode extends BaseEntity {
+public class ProcessNode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
 
     /**
      * 类型 1开始 2流转 3结束
@@ -49,22 +53,11 @@ public class ProcessNode extends BaseEntity {
     /**
      * 处理人类型
      */
-    private Integer handleType;
+    private Integer handleObjectType;
 
     /**
      * 指定类型id集合
      */
-    private String handleTypeIdSet;
-
-    /**
-     * 通过规则 1 n人同意
-     */
-    private Integer passRule;
-
-    /**
-     * 通过数值 （n/人）
-     */
-    private BigDecimal passValue;
-
+    private String handleObjectIdSet;
 
 }

hx-service-api/service-flow-api/src/main/java/com/fjhx/entity/process/ProcessNodeHandle.java

@@ -1,24 +1,29 @@
 package com.fjhx.entity.process;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fjhx.base.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author ${author}
  * @since 2022-08-12
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class ProcessNodeHandle extends BaseEntity {
+public class ProcessNodeHandle implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
 
     /**
      * 流程id

hx-service-api/service-flow-api/src/main/java/com/fjhx/enums/ProcessInfoParallelRulesEnum.java

@@ -2,6 +2,9 @@ package com.fjhx.enums;
 
 import lombok.Getter;
 
+/**
+ * 流程并行规则枚举
+ */
 @Getter
 public enum ProcessInfoParallelRulesEnum {
 

hx-service-api/service-flow-api/src/main/java/com/fjhx/enums/ProcessNodeHandleObjectTypeEnum.java

@@ -0,0 +1,23 @@
+package com.fjhx.enums;
+
+import lombok.Getter;
+
+/**
+ * 流程节点指定处理对象类型枚举
+ */
+@Getter
+public enum ProcessNodeHandleObjectTypeEnum {
+
+    all(0), // 全部
+    user(1), // 指定用户
+    role(2), // 指定角色
+    dept(3), // 指定部门
+    ;
+
+    private final Integer type;
+
+    ProcessNodeHandleObjectTypeEnum(Integer type) {
+        this.type = type;
+    }
+
+}

hx-service-api/service-flow-api/src/main/java/com/fjhx/enums/ProcessNodeTypeEnum.java

@@ -2,12 +2,15 @@ package com.fjhx.enums;
 
 import lombok.Getter;
 
+/**
+ * 流程节点类型
+ */
 @Getter
 public enum ProcessNodeTypeEnum {
 
-    start(1), // 开始
-    roam(2), // 流转
-    end(3) // 结束
+    start(1), // 开始节点
+    roam(2), // 流转流转节点
+    end(3) // 结束节点
     ;
 
     private final Integer type;

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/constant/common/ConfigConstant.java → hx-service-api/storage-restructure-api/src/main/java/com/fjhx/constants/common/ConfigConstant.java

@@ -1,4 +1,4 @@
-package com.fjhx.constant.common;
+package com.fjhx.constants.common;
 
 /**
  * 配置key常量

hx-service-api/syringe-management-api/src/main/java/com/fjhx/constant/IotManagementLockConstant.java → hx-service-api/syringe-management-api/src/main/java/com/fjhx/constants/IotManagementLockConstant.java

@@ -1,4 +1,4 @@
-package com.fjhx.constant;
+package com.fjhx.constants;
 
 /**
  * 锁常量

hx-service-api/syringe-production-api/src/main/java/com/fjhx/constant/IotProductionRedisPrefixConstant.java → hx-service-api/syringe-production-api/src/main/java/com/fjhx/constants/IotProductionRedisPrefixConstant.java

@@ -1,4 +1,4 @@
-package com.fjhx.constant;
+package com.fjhx.constants;
 
 /**
  * 锁常量

hx-service/basics/src/main/java/com/fjhx/controller/StockController.java

@@ -1,7 +1,7 @@
 package com.fjhx.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.constant.StockJournalTypeConstant;
+import com.fjhx.constants.StockJournalTypeConstant;
 import com.fjhx.service.StockExService;
 import com.fjhx.service.StockService;
 import org.springblade.core.tool.api.R;

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.constant.common.ConfigConstant;
+import com.fjhx.constants.common.ConfigConstant;
 import com.fjhx.entity.material.Material;
 import com.fjhx.mapper.material.MaterialMapper;
 import com.fjhx.params.material.MaterialVo;

hx-service/syringe-management/src/main/java/com/fjhx/service/bom/impl/BomServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseEntity;
-import com.fjhx.constant.IotManagementLockConstant;
+import com.fjhx.constants.IotManagementLockConstant;
 import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.FileInfo;

hx-service/syringe-production/src/main/java/com/fjhx/service/amqp/impl/AmqpDataServiceImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.config.amqp.AmqpClient;
 import com.fjhx.config.amqp.AmqpConstants;
-import com.fjhx.constant.IotProductionRedisPrefixConstant;
+import com.fjhx.constants.IotProductionRedisPrefixConstant;
 import com.fjhx.entity.amqp.AmqpData;
 import com.fjhx.mapper.amqp.AmqpDataMapper;
 import com.fjhx.service.amqp.AmqpDataService;