缓存优化

flow-app/src/main/resources/mapper/workflow/FlowDefineDao.xml

@@ -27,15 +27,14 @@
 
     <sql id="defProcess">
         SELECT rp.ID_               AS define_id,
-               rp.CATEGORY_         AS group_id,
                rp.KEY_              AS `key_`,
                rp.NAME_             AS name,
                rp.VERSION_          AS version,
-               rp.CATEGORY_         AS groupId,
                rp.SUSPENSION_STATE_ AS suspend,
                rp.DEPLOYMENT_ID_    AS deployment_id,
                rp.DESCRIPTION_      AS description,
                fd.id,
+               fd.group_id,
                fd.icon,
                fd.process,
                fd.form,
@@ -52,15 +51,14 @@
     <select id="getList" resultMap="BaseResultMap">
         SELECT
             rp.ID_               AS define_id,
-            rp.CATEGORY_         AS group_id,
             rp.KEY_              AS `key_`,
             rp.NAME_             AS name,
             rp.VERSION_          AS version,
-            rp.CATEGORY_         AS groupId,
             rp.SUSPENSION_STATE_ AS suspend,
             rp.DEPLOYMENT_ID_    AS deployment_id,
             rp.DESCRIPTION_      AS description,
             fd.id,
+            fd.group_id,
             fd.icon,
             fd.admin,
             fd.starters,
@@ -78,7 +76,7 @@
                 and rp.NAME_ like CONCAT( '%',#{name},'%')
             </if>
             <if test="groupId != null and groupId != ''">
-                and rp.CATEGORY_ = #{groupId}
+                and fd.group_id = #{groupId}
             </if>
         </where>
         order by fd.id desc

flow-common/flow-common-flowable-starter/src/main/java/com/flow/flowable/loader/FlowableSerializable.java

@@ -2,7 +2,6 @@ package com.flow.flowable.loader;
 
 import org.apache.ibatis.javassist.*;
 
-import java.util.Arrays;
 import java.util.List;
 
 public class FlowableSerializable {

flow-workflow/flow-workflow-biz/src/main/java/com/flow/service/impl/FlowModelServiceImpl.java

@@ -172,14 +172,12 @@ public class FlowModelServiceImpl extends BaseServiceImpl<FlowModelDao, FlowMode
                 .addBpmnModel(String.format("%s.bpmn20.xml", flowModel.getName()), bpmnModel)
                 // .enableDuplicateFiltering()
                 .deploy();
-
         ProcessDefinition definition = repositoryService.createProcessDefinitionQuery()
                 .deploymentId(deploy.getId())
                 .singleResult();
-        repositoryService.setProcessDefinitionCategory(definition.getId(), flowModel.getGroupId().toString());
-
         FlowDefine flowDefine = new FlowDefine(definition);
         flowDefine.setModelId(flowModel.getId());
+        flowDefine.setGroupId(flowModel.getGroupId());
         flowDefine.setProcess(flowModel.getProcess());
         flowDefine.setForm(flowModel.getForm());
         flowDefine.setIcon(flowModel.getIcon());

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/FlowDefine.java

@@ -31,14 +31,14 @@ public class FlowDefine extends BaseEntity {
     private String defineId;
     @JsonSerialize(using = ToStringSerializer.class)
     private Long modelId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long groupId;
     @TableField(exist = false)
     private String key;
     @TableField(exist = false)
     private String name;
     @TableField(exist = false)
     private Integer version;
-    @TableField(exist = false)
-    private String groupId;
     @TableField(typeHandler = JacksonTypeHandler.class)
     private List<String> admin;
     @TableField(typeHandler = JacksonTypeHandler.class)
@@ -63,7 +63,6 @@ public class FlowDefine extends BaseEntity {
         this.key = processDefinition.getKey();
         this.name = processDefinition.getName();
         this.version = processDefinition.getVersion();
-        this.groupId = processDefinition.getCategory();
         this.deploymentId = processDefinition.getDeploymentId();
         this.description = processDefinition.getDescription();
         this.suspend = processDefinition.isSuspended() ? 2 : 1;