重构暂存

flow-workflow/flow-workflow-api/src/main/java/com/flow/service/FlowTempService.java

@@ -1,13 +0,0 @@
-package com.flow.service;
-
-import com.flow.common.mybatis.service.BaseService;
-import com.flow.entity.FlowTemp;
-
-public interface FlowTempService extends BaseService<FlowTemp> {
-
-    FlowTemp saveData(FlowTemp flowTemp);
-
-    FlowTemp getByBusinessId(String businessId);
-
-    void deleteByBusinessId(String businessId);
-}

flow-workflow/flow-workflow-biz/src/main/java/com/flow/dao/FlowTempDao.java

@@ -1,7 +0,0 @@
-package com.flow.dao;
-
-import com.flow.common.mybatis.dao.BaseDao;
-import com.flow.entity.FlowTemp;
-
-public interface FlowTempDao extends BaseDao<FlowTemp> {
-}

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

@@ -11,7 +11,6 @@ import com.flow.common.mybatis.service.impl.BaseServiceImpl;
 import com.flow.common.redis.service.RedisService;
 import com.flow.dao.FlowDefineDao;
 import com.flow.entity.FlowDefine;
-import com.flow.entity.FlowTemp;
 import com.flow.entity.FormModel;
 import com.flow.entity.form.Field;
 import com.flow.entity.form.serial.SerialRule;
@@ -23,7 +22,6 @@ import com.flow.enums.ProcessStatus;
 import com.flow.model.FormInfo;
 import com.flow.model.StartProcess;
 import com.flow.service.FlowDefineService;
-import com.flow.service.FlowTempService;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.common.engine.impl.identity.Authentication;
@@ -43,7 +41,6 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
@@ -59,9 +56,9 @@ public class FlowDefineServiceImpl extends BaseServiceImpl<FlowDefineDao, FlowDe
     @Autowired
     private RedisService<Long> redisService;
     @Autowired
-    private ObjectMapper objectMapper;
+    private RedisService<Map<String, Object>> redisMapService;
     @Autowired
-    private FlowTempService flowTempService;
+    private ObjectMapper objectMapper;
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -148,7 +145,7 @@ public class FlowDefineServiceImpl extends BaseServiceImpl<FlowDefineDao, FlowDe
                 .variables(values)
                 .start();
         // 删除暂存
-        flowTempService.deleteByBusinessId(startProcess.getDefineId());
+        redisMapService.hdel(startProcess.getDefineId(), SecurityContextUtil.getUserId());
         try {
             runtimeService.setVariable(instanceId, "_SKIP_INITIATOR", false);
         } catch (Exception ignored) {
@@ -199,34 +196,18 @@ public class FlowDefineServiceImpl extends BaseServiceImpl<FlowDefineDao, FlowDe
         }
         RootNode rootNode = (RootNode) define.getProcess();
         List<FieldProperty> formProperties = rootNode.getFormProperties();
-        return new FormInfo(define, formProperties, null);
+        Map variables = redisMapService.hget(defineId, SecurityContextUtil.getUserId(), Map.class);
+        return new FormInfo(define, formProperties, variables);
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void storeFormDataTemporarily(StartProcess startProcess) {
-        Optional<FlowTemp> optional = flowTempService.lambdaQuery()
-                .eq(FlowTemp::getBusinessId, startProcess.getDefineId())
-                .eq(FlowTemp::getUserId, SecurityContextUtil.getUserId())
-                .oneOpt();
-        if (optional.isPresent()) {
-            FlowTemp flowTemp = optional.get();
-            flowTemp.setData(startProcess.getValues());
-            flowTempService.updateById(flowTemp);
-            return;
-        }
-        FlowTemp flowTemp = new FlowTemp();
-        flowTemp.setBusinessId(startProcess.getDefineId());
-        flowTemp.setUserId(SecurityContextUtil.getUserId());
-        flowTemp.setData(startProcess.getValues());
-        flowTempService.saveData(flowTemp);
+        redisMapService.hset(startProcess.getDefineId(), SecurityContextUtil.getUserId(), startProcess.getValues());
     }
 
     @Override
     public Map<String, Object> getFormDataTemporarily(String defineId) {
-        FlowTemp flowTemp = flowTempService.getByBusinessId(defineId);
-        return Optional.ofNullable(flowTemp)
-                .map(FlowTemp::getData)
-                .orElse(null);
+        return redisMapService.hget(defineId, SecurityContextUtil.getUserId(), Map.class);
     }
 }

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

@@ -1,40 +0,0 @@
-package com.flow.service.impl;
-
-import com.flow.common.core.util.SecurityContextUtil;
-import com.flow.common.mybatis.constant.SqlConstant;
-import com.flow.common.mybatis.service.impl.BaseServiceImpl;
-import com.flow.dao.FlowTempDao;
-import com.flow.entity.FlowTemp;
-import com.flow.service.FlowTempService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class FlowTempServiceImpl extends BaseServiceImpl<FlowTempDao, FlowTemp> implements FlowTempService {
-    @Autowired
-    private FlowTempDao flowTempDao;
-
-    @Override
-    public FlowTemp saveData(FlowTemp flowTemp) {
-        flowTempDao.insert(flowTemp);
-        return flowTemp;
-    }
-
-    @Override
-    public FlowTemp getByBusinessId(String businessId) {
-        return flowTempDao.lambdaQueryChain()
-                .eq(FlowTemp::getBusinessId, businessId)
-                .eq(FlowTemp::getUserId, SecurityContextUtil.getUserId())
-                .last(SqlConstant.LIMIT1)
-                .one();
-    }
-
-    @Override
-    public void deleteByBusinessId(String businessId) {
-        flowTempDao.lambdaUpdateChain()
-                .eq(FlowTemp::getBusinessId, businessId)
-                .eq(FlowTemp::getUserId, SecurityContextUtil.getUserId())
-                .remove();
-    }
-
-}

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

@@ -1,24 +0,0 @@
-package com.flow.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.flow.common.mybatis.entity.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@TableName(value = "flow_temp", autoResultMap = true)
-public class FlowTemp extends BaseEntity {
-    private String businessId;
-    private String userId;
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private Map<String, Object> data;
-}

sql/dm.sql

@@ -768,30 +768,6 @@ COMMENT ON COLUMN "FLOW_TASK"."STATUS" IS '状态';
 COMMENT ON COLUMN "FLOW_TASK"."VARIABLES" IS '变量';
 
 
-CREATE TABLE "SYSDBA"."FLOW_TEMP"
-(
-    "ID" NUMBER(19,0) NOT NULL,
-    "BUSINESS_ID" VARCHAR2(64 CHAR) NOT NULL,
-    "USER_ID" VARCHAR2(100 CHAR) NOT NULL,
-    "DATA" CLOB NOT NULL,
-    "CREATED_BY" VARCHAR2(100 CHAR) NOT NULL,
-    "UPDATED_BY" VARCHAR2(100 CHAR) DEFAULT NULL,
-    "CREATE_TIME" TIMESTAMP(0) NOT NULL,
-    "UPDATE_TIME" TIMESTAMP(0),
-    CONSTRAINT "PK_FLOW_TEMP" NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ;
-
-COMMENT ON TABLE "SYSDBA"."FLOW_TEMP" IS '暂存';
-COMMENT ON COLUMN "SYSDBA"."FLOW_TEMP"."ID" IS 'id';
-COMMENT ON COLUMN "SYSDBA"."FLOW_TEMP"."BUSINESS_ID" IS '业务id';
-COMMENT ON COLUMN "SYSDBA"."FLOW_TEMP"."USER_ID" IS '用户id';
-COMMENT ON COLUMN "SYSDBA"."FLOW_TEMP"."DATA" IS '内容';
-COMMENT ON COLUMN "SYSDBA"."FLOW_TEMP"."CREATED_BY" IS '创建者';
-COMMENT ON COLUMN "SYSDBA"."FLOW_TEMP"."UPDATED_BY" IS '更新者';
-COMMENT ON COLUMN "SYSDBA"."FLOW_TEMP"."CREATE_TIME" IS '创建日期';
-COMMENT ON COLUMN "SYSDBA"."FLOW_TEMP"."UPDATE_TIME" IS '更新时间';
-
-
-
 COMMIT;
 
 

sql/mysql.sql

@@ -157,26 +157,6 @@ CREATE TABLE `flow_task`  (
 -- ----------------------------
 
 
--- ----------------------------
--- Table structure for flow_temp
--- ----------------------------
-DROP TABLE IF EXISTS `flow_temp`;
-CREATE TABLE `flow_temp` (
-  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `business_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '业务id',
-  `user_id` varchar(100) NOT NULL COMMENT '用户id',
-  `data` json NOT NULL COMMENT '内容',
-  `created_by` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '创建者',
-  `updated_by` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新者',
-  `create_time` datetime NOT NULL COMMENT '创建日期',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-
--- ----------------------------
--- Records of flow_temp
--- ----------------------------
-
 -- ----------------------------
 -- Table structure for oauth_access_token
 -- ----------------------------