流程

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

@@ -0,0 +1,32 @@
+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>
+ * 流程实例 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-18
+ */
+@RestController
+@RequestMapping("/exampleInfo")
+public class ExampleInfoController {
+
+    @Autowired
+    private ExampleInfoService exampleInfoService;
+
+}
+

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

@@ -1,8 +1,9 @@
 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.process.SaveNodeListVo;
+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;
@@ -26,15 +27,21 @@ public class ProcessNodeController {
     @Autowired
     private ProcessNodeService processNodeService;
 
+    @Autowired
+    private ProcessNodeButtonService processNodeButtonService;
+
     /**
      * 创建节点
      */
     @PostMapping("/add")
-    public R add(@RequestBody ProcessNode processNode) {
-        processNodeService.save(processNode);
-        return R.success(processNode);
+    public R add(@RequestBody ProcessNodeVo processNodeVo) {
+        processNodeService.add(processNodeVo);
+        return R.success(processNodeVo);
     }
 
+    /**
+     * 编辑节点
+     */
     @PostMapping("edit")
     public R edit(@RequestBody ProcessNodeVo processNodeVo) {
         processNodeService.edit(processNodeVo);
@@ -54,9 +61,12 @@ public class ProcessNodeController {
      * 保存节点
      */
     @PostMapping("/saveNodeList")
-    public R delete(@RequestBody SaveNodeListVo vo) {
+    public R saveNodeList(@RequestBody ProcessNode processNode) {
+        Long processTenantId = processNode.getProcessTenantId();
 
+        processNodeButtonService.remove(ProcessNodeButton::getProcessTenantId, processTenantId);
 
+        processNodeButtonService.insertNodeButton(processNodeService.list(ProcessNode::getProcessTenantId, processTenantId));
         return R.success();
     }
 

hx-common/service-flow/src/main/java/com/fjhx/mapper/example/ExampleInfoMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.example;
+
+import com.fjhx.entity.example.ExampleInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 流程实例 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-18
+ */
+public interface ExampleInfoMapper extends BaseMapper<ExampleInfo> {
+
+}

hx-common/service-flow/src/main/java/com/fjhx/mapper/example/ExampleInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.mapper.example.ExampleInfoMapper">
+
+</mapper>

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

@@ -0,0 +1,20 @@
+package com.fjhx.service.example;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.example.ExampleInfo;
+import com.fjhx.params.example.ExampleInfoVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 流程实例 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-18
+ */
+public interface ExampleInfoService extends BaseService<ExampleInfo> {
+
+}

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

@@ -0,0 +1,28 @@
+package com.fjhx.service.example.impl;
+
+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.fjhx.utils.WrapperUtil;
+import com.fjhx.entity.example.ExampleInfo;
+import com.fjhx.params.example.ExampleInfoVo;
+import com.fjhx.mapper.example.ExampleInfoMapper;
+import com.fjhx.service.example.ExampleInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 流程实例 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-18
+ */
+@Service
+public class ExampleInfoServiceImpl extends ServiceImpl<ExampleInfoMapper, ExampleInfo> implements ExampleInfoService {
+
+
+}

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

@@ -4,8 +4,6 @@ import com.fjhx.base.BaseService;
 import com.fjhx.entity.process.ProcessNode;
 import com.fjhx.params.process.ProcessNodeVo;
 
-import java.util.List;
-
 /**
  * <p>
  * 服务类
@@ -16,6 +14,8 @@ import java.util.List;
  */
 public interface ProcessNodeService extends BaseService<ProcessNode> {
 
+    void add(ProcessNodeVo processNodeVo);
+
     void edit(ProcessNodeVo processNodeVo);
 
 }

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

@@ -42,7 +42,7 @@ public class ProcessInfoServiceImpl extends ServiceImpl<ProcessInfoMapper, Proce
     public Page<ProcessInfo> getPage(Map<String, String> condition) {
 
         String serviceName = condition.get("serviceName");
-        String moduleName = condition.get("moduleName");
+        String moduleName = condition.get("keyword");
 
         LambdaQueryWrapper<ProcessInfo> wrapper = Wrappers.lambdaQuery();
 

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

@@ -71,6 +71,7 @@ public class ProcessNodeButtonServiceImpl extends ServiceImpl<ProcessNodeButtonM
                     break;
 
                 case BRANCH: // 分支
+                    handleBranch(processNodeButtonList, processNode);
                     break;
 
                 case END: // 结束
@@ -82,6 +83,7 @@ public class ProcessNodeButtonServiceImpl extends ServiceImpl<ProcessNodeButtonM
         saveBatch(processNodeButtonList);
     }
 
+
     /**
      * 开始节点处理
      */
@@ -89,7 +91,7 @@ public class ProcessNodeButtonServiceImpl extends ServiceImpl<ProcessNodeButtonM
                              Map<Long, List<ProcessNode>> ProcessNodeGroupByParentId,
                              ProcessNode processNode) {
         // 下一步
-        ProcessNodeButton next = next(ProcessNodeGroupByParentId, processNode, ButtonNameEnum.ADOPT);
+        ProcessNodeButton next = next(ProcessNodeGroupByParentId, processNode, ButtonNameEnum.START);
         processNodeButtonList.add(next);
     }
 
@@ -129,22 +131,46 @@ public class ProcessNodeButtonServiceImpl extends ServiceImpl<ProcessNodeButtonM
                         Map<Long, List<ProcessNode>> ProcessNodeGroupByParentId,
                         ProcessNode processNode) {
         // 完成
-        ProcessNodeButton next = next(ProcessNodeGroupByParentId, processNode, ButtonNameEnum.complete);
+        ProcessNodeButton next = next(ProcessNodeGroupByParentId, processNode, ButtonNameEnum.COMPLETE);
         processNodeButtonList.add(next);
     }
 
     /**
+     * 分支
+     */
+    private void handleBranch(List<ProcessNodeButton> processNodeButtonList, ProcessNode processNode) {
+        ProcessNodeButton processNodeButton = createProcessNodeButton(processNode, ButtonNameEnum.BRANCH);
+        processNodeButtonList.add(processNodeButton);
+    }
+
+    /**
      * 跳转上一节点
      */
     private ProcessNodeButton previous(Map<Long, List<ProcessNode>> ProcessNodeGroupById,
                                        ProcessNode processNode, ButtonNameEnum buttonNameEnum) {
         ProcessNodeButton processNodeButton = createProcessNodeButton(processNode, buttonNameEnum);
+
         // 赋值跳转到上一节点
         List<ProcessNode> previousProcessNodeList = ProcessNodeGroupById.get(processNode.getParentId());
         if (previousProcessNodeList == null || previousProcessNodeList.size() != 1) {
             throw new ServiceException(String.format(FlowExplainConstant.PREVIOUS_ERROR, processNode.getName()));
         }
-        processNodeButton.setJumpNodeId(previousProcessNodeList.get(0).getId());
+
+        // 如果上一节点是分支，再往上一层级流转
+        ProcessNode node = previousProcessNodeList.get(0);
+        if (node.getType().equals(ProcessNodeTypeEnum.BRANCH.getType())) {
+
+            previousProcessNodeList = ProcessNodeGroupById.get(node.getParentId());
+            if (previousProcessNodeList == null || previousProcessNodeList.size() != 1) {
+                throw new ServiceException(String.format(FlowExplainConstant.PREVIOUS_ERROR, processNode.getName()));
+            }
+
+            processNodeButton.setJumpNodeId(node.getParentId());
+        } else {
+            processNodeButton.setJumpNodeId(node.getId());
+        }
+
+
         return processNodeButton;
     }
 

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

@@ -7,12 +7,11 @@ 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.service.process.ProcessNodeButtonService;
 import com.fjhx.service.process.ProcessNodeService;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.FileClientUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -27,8 +26,21 @@ import java.util.List;
 @Service
 public class ProcessNodeServiceImpl extends ServiceImpl<ProcessNodeMapper, ProcessNode> implements ProcessNodeService {
 
-    @Autowired
-    private ProcessNodeButtonService processNodeButtonService;
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void add(ProcessNodeVo processNodeVo) {
+        verificationField(processNodeVo);
+        save(processNodeVo);
+        FileClientUtil.bindingFile(processNodeVo.getId(), processNodeVo.getFileInfo());
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void edit(ProcessNodeVo processNodeVo) {
+        verificationField(processNodeVo);
+        updateById(processNodeVo);
+        FileClientUtil.againBindingFile(processNodeVo.getId(), processNodeVo.getFileInfo());
+    }
 
     /**
      * 验证字段
@@ -63,11 +75,4 @@ public class ProcessNodeServiceImpl extends ServiceImpl<ProcessNodeMapper, Proce
 
     }
 
-    @Override
-    public void edit(ProcessNodeVo processNodeVo) {
-        verificationField(processNodeVo);
-        FileClientUtil.againBindingFile(processNodeVo.getId(), processNodeVo.getFileInfo());
-        updateById(processNodeVo);
-    }
-
 }

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

@@ -84,7 +84,7 @@ public class ProcessTenantServiceImpl extends ServiceImpl<ProcessTenantMapper, P
 
         // 赋值默认版本号
         processTenant.setVersionNumber(FlowConstant.DEFAULT_VERSION_NUMBER);
-        processTenant.setCurrent(StatusConstant.YES);
+        processTenant.setCurrentVersion(StatusConstant.YES);
 
         // 保存数据
         save(processTenant);
@@ -111,7 +111,7 @@ public class ProcessTenantServiceImpl extends ServiceImpl<ProcessTenantMapper, P
 
         // 版本号+1 设为非当前流程
         newProcessTenant.setVersionNumber(newProcessTenant.getVersionNumber() + 1);
-        newProcessTenant.setCurrent(StatusConstant.No);
+        newProcessTenant.setCurrentVersion(StatusConstant.No);
 
         // 保存数据
         save(newProcessTenant);
@@ -135,11 +135,11 @@ public class ProcessTenantServiceImpl extends ServiceImpl<ProcessTenantMapper, P
         String bindingTenantId = processTenant.getBindingTenantId();
 
         update(Wrappers.<ProcessTenant>lambdaUpdate()
-                .set(ProcessTenant::getCurrent, StatusConstant.No)
+                .set(ProcessTenant::getCurrentVersion, StatusConstant.No)
                 .eq(ProcessTenant::getProcessInfoId, processInfoId)
                 .eq(ProcessTenant::getBindingTenantId, bindingTenantId));
 
-        processTenant.setCurrent(StatusConstant.YES);
+        processTenant.setCurrentVersion(StatusConstant.YES);
         updateById(processTenant);
     }
 

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

@@ -0,0 +1,64 @@
+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.TableLogic;
+import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 流程实例
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExampleInfo extends BaseEntity {
+
+
+    /**
+     * 流程id
+     */
+    private Long processInfoId;
+
+    /**
+     * 租户流程id
+     */
+    private Long processTenantId;
+
+    /**
+     * 所在节点id
+     */
+    private Long processNodeId;
+
+    /**
+     * 是否完成
+     */
+    private Integer complete;
+
+    /**
+     * 业务id
+     */
+    private Long businessId;
+
+    /**
+     * 缓存数据
+     */
+    private String cacheData;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

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

@@ -26,7 +26,7 @@ public class ProcessNode implements Serializable {
     private Long id;
 
     /**
-     * 类型 0开始1审核 2审批 3办理 99结束
+     * 类型 1开始 2审核 3审批 4办理 5分支 99结束
      */
     private Integer type;
 

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

@@ -46,7 +46,7 @@ public class ProcessNodeButton implements Serializable {
     private Integer nameType;
 
     /**
-     * 处理类型
+     * 跳转节点id
      */
     private Long jumpNodeId;
 

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

@@ -48,6 +48,6 @@ public class ProcessTenant implements Serializable {
     /**
      * 是否当前版本
      */
-    private Integer current;
+    private Integer currentVersion;
 
 }

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

@@ -17,7 +17,11 @@ public enum ButtonNameEnum {
     AGREE(3, "同意"),
     REJECT(4, "驳回"),
     // 办理
-    complete(5, "完成");
+    COMPLETE(5, "完成"),
+    // 发起
+    START(6, "开始"),
+    // 执行分支逻辑
+    BRANCH(7, "分支");
 
 
     private final Integer type;

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

@@ -8,11 +8,11 @@ import lombok.Getter;
 @Getter
 public enum ProcessInfoParallelRulesEnum {
 
-    NO(0), // 无规则
-    BUSINESS(1), // 业务禁止并行
-    USER(2), // 用户禁止并行
-    ROLE(3), // 角色禁止并行
-    DEPT(4), // 部门禁止并行
+    NO(1), // 无规则
+    BUSINESS(2), // 业务禁止并行
+    USER(3), // 用户禁止并行
+    ROLE(4), // 角色禁止并行
+    DEPT(5), // 部门禁止并行
     ;
 
     private final Integer type;

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

@@ -8,10 +8,10 @@ import lombok.Getter;
 @Getter
 public enum ProcessNodeHandleObjectTypeEnum {
 
-    ALL(0), // 全部
-    USER(1), // 指定用户
-    ROLE(2), // 指定角色
-    DEPT(3), // 指定部门
+    ALL(1), // 全部
+    USER(2), // 指定用户
+    ROLE(3), // 指定角色
+    DEPT(4), // 指定部门
     ;
 
     private final Integer type;

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

@@ -10,11 +10,11 @@ import java.util.HashMap;
 @Getter
 public enum ProcessNodeTypeEnum {
 
-    START(0), // 开始节点
-    EXAMINED(1), // 审核（可以进行通过/不通过操作，通过后流程向下一节点流转，不通过则退回上一节点）
-    APPROVAL(2), // 审批（可以进行同意/驳回操作，同意后向下一节点流转，驳回则以驳回状态结束本流程）
-    HANDLE(3), // 办理（仅支持完成办理操作，操作后向下一节点流转）
-    BRANCH(4), // 分支
+    START(1), // 开始节点
+    EXAMINED(2), // 审核（可以进行通过/不通过操作，通过后流程向下一节点流转，不通过则退回上一节点）
+    APPROVAL(3), // 审批（可以进行同意/驳回操作，同意后向下一节点流转，驳回则以驳回状态结束本流程）
+    HANDLE(4), // 办理（仅支持完成办理操作，操作后向下一节点流转）
+    BRANCH(5), // 分支
     END(99) // 结束节点
     ;
 

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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,17 @@
+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/syringe-production-api/src/main/java/com/fjhx/constants/IotProductionRedisPrefixConstant.java

@@ -1,12 +1,12 @@
 package com.fjhx.constants;
 
 /**
- * 锁常量
+ * 缓存前缀
  */
 public interface IotProductionRedisPrefixConstant {
 
     /**
-     * 添加前缀，防止其他模块出现共用一把锁的情况
+     * 设备状态前缀
      */
     String INSTANTANEOUS_STATE = "IotProduction-instantaneousState:";
 

hx-service/syringe-production/src/main/java/com/fjhx/controller/amqp/AmqpController.java

@@ -0,0 +1,28 @@
+package com.fjhx.controller.amqp;
+
+import com.fjhx.constants.IotProductionRedisPrefixConstant;
+import com.fjhx.entity.amqp.AmqpData;
+import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.tool.api.R;
+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 javax.annotation.Resource;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/amqpData")
+public class AmqpController {
+
+    @Resource
+    private BladeRedis redisCache;
+
+    @PostMapping("/getEquipmentInfo")
+    public R getEquipmentInfo(@RequestBody Map<String, String> condition) {
+        AmqpData equipmentNo = redisCache.get(IotProductionRedisPrefixConstant.INSTANTANEOUS_STATE + condition.get("equipmentNo"));
+        return R.success(equipmentNo);
+    }
+
+}

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

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.jms.MessageConsumer;
 import java.util.Collection;
 import java.util.Date;
@@ -35,7 +36,7 @@ public class AmqpDataServiceImpl extends ServiceImpl<AmqpDataMapper, AmqpData> i
     @Autowired
     private AmqpClient amqpClient;
 
-    @Autowired
+    @Resource
     private BladeRedis redisCache;
 
     @Override