feat: 修改框架reids布局

cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/AdminPortalController.java

@@ -3,7 +3,6 @@ package com.qs.serve.controller;
 import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.framework.base.config.properties.ProjectProperties;
-import com.qs.serve.framework.base.framework.redis.RedisService;
 import com.qs.serve.framework.base.framework.security.model.LoginUserType;
 import com.qs.serve.common.annotation.LimitSubmit;
 import com.qs.serve.common.annotation.SysLog;
@@ -16,6 +15,7 @@ import com.qs.serve.framework.base.util.*;
 import com.qs.serve.framework.base.util.model.DateFormatString;
 import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.controller.dto.SyLoginParam;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.modules.seeyon.SyKeyLoginUtil;
 import com.qs.serve.modules.bms.service.BmsSupplierAddressService;
 import com.qs.serve.modules.goods.entity.GoodsCategory;

cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java

@@ -1,7 +1,6 @@
 package com.qs.serve.controller;
 
 import com.qs.serve.common.exception.Assert;
-import com.qs.serve.framework.base.framework.redis.RedisService;
 import com.qs.serve.framework.base.framework.security.model.LoginUser;
 import com.qs.serve.framework.base.framework.security.model.LoginUserType;
 import com.qs.serve.common.annotation.SysLog;
@@ -13,6 +12,7 @@ import com.qs.serve.common.enums.InterType;
 import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.ServletUtils;
 import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.mapper.SysTenantMapper;
 import com.qs.serve.modules.sys.service.SysUserService;

cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/HisTask.java

@@ -1,7 +1,7 @@
 package com.qs.serve.task;
 
-import com.qs.serve.framework.base.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.his.service.HisUserSupplierTempService;
 import lombok.AllArgsConstructor;

cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/HistTestController.java

@@ -1,9 +1,9 @@
 package com.qs.serve.task.controller;
 
 import com.qs.serve.framework.base.config.DevEnvironmentConfig;
-import com.qs.serve.framework.base.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
 import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.modules.his.service.HisUserChannelPointService;
 import com.qs.serve.task.HisTask;
 import lombok.AllArgsConstructor;

cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskSupplierController.java

@@ -1,8 +1,8 @@
 package com.qs.serve.task.controller;
 
-import com.qs.serve.framework.base.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
 import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.modules.his.service.HisUserSupplierTempService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

cms-common/pom.xml

@@ -100,6 +100,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/SpringUtils.java → cms-common/src/main/java/com/qs/serve/common/utils/SpringUtils.java

@@ -1,5 +1,6 @@
-package com.qs.serve.framework.base.util;
+package com.qs.serve.common.utils;
 
+import cn.hutool.core.collection.CollectionUtil;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;

cms-framework/cms-framework-base/pom.xml

@@ -18,6 +18,12 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>com.qs</groupId>
+            <artifactId>cms-framework-redis</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>com.qs</groupId>
             <artifactId>cms-common</artifactId>
@@ -40,10 +46,6 @@
             <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LimitSubmitInterceptor.java

@@ -1,9 +1,9 @@
 package com.qs.serve.framework.base.framework.interceptor;
 
-import com.qs.serve.framework.base.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.HttpResponsePrintUtil;
 import com.qs.serve.common.annotation.LimitSubmit;
 import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.framework.redis.RedisService;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;

cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/manager/AsyncManager.java

@@ -1,6 +1,6 @@
 package com.qs.serve.framework.base.framework.manager;
 
-import com.qs.serve.framework.base.util.SpringUtils;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.framework.base.util.ThreadsUtils;
 
 import java.util.TimerTask;

cms-framework/cms-framework-feign/src/main/java/com/qs/serve/feign/FeignRequestInterceptor.java

@@ -5,6 +5,10 @@ import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * @author YenHex
  * @since 2025/4/17
@@ -16,6 +20,24 @@ public class FeignRequestInterceptor implements RequestInterceptor {
     public void apply(RequestTemplate template) {
         template.header("userId", SecurityUserUtil.getUserId());
         template.header("tenant-id", SecurityUserUtil.getTenant());
+
+        //1：获取普通参数
+//        Map<String, Collection<String>> queries = template.queries();
+//        Collection<String> authorization = queries.get("userId");
+//        if (authorization != null) {
+//            requestTemplate.header("Authorization", authorization);
+//            return;
+//        }
+
+        Collection<String> userIds = template.headers().get("userId");
+        if(userIds.size()>0){
+            SecurityUserUtil.setUserId(userIds.iterator().next());
+        }
+        Collection<String> tenants = template.headers().get("tenant-id");
+        if(tenants.size()>0){
+            SecurityUserUtil.setTenant(tenants.iterator().next());
+        }
+
     }
 
 }

cms-framework/cms-framework-redis/pom.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cms-framework</artifactId>
+        <groupId>com.qs</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cms-framework-redis</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.qs</groupId>
+            <artifactId>cms-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/RedisService.java → cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/RedisService.java

@@ -1,4 +1,4 @@
-package com.qs.serve.framework.base.framework.redis;
+package com.qs.serve.framework.redis;
 
 import com.qs.serve.common.exception.Assert;
 import lombok.AllArgsConstructor;

cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/TtlRedisCacheManager.java → cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/TtlRedisCacheManager.java

@@ -1,4 +1,4 @@
-package com.qs.serve.framework.base.framework.redis;
+package com.qs.serve.framework.redis;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.cache.RedisCache;

cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/CodeGenUtil.java → cms-framework/cms-framework-redis/src/main/java/com/qs/serve/framework/redis/utils/CodeGenUtil.java

@@ -1,7 +1,8 @@
-package com.qs.serve.framework.base.util;
+package com.qs.serve.framework.redis.utils;
 
-import com.qs.serve.framework.base.config.DevEnvironmentConfig;
+import cn.hutool.core.util.IdUtil;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.common.utils.SpringUtils;
+import com.qs.serve.framework.redis.RedisService;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.springframework.beans.BeansException;
@@ -98,8 +99,8 @@ public class CodeGenUtil {
             appendZeros.append("0");
         }
         //用于区分测试环境数据
-        String subflex = DevEnvironmentConfig.isDev()?"TEST":"";
+        //String subflex = DevEnvironmentConfig.isDev()?"TEST":"";
-        return digitsNum + appendZeros + appendStr+subflex;
+        return digitsNum + appendZeros + appendStr;
     }
 
     public synchronized static String getDataCode(SourceDataKey dataKey){

cms-framework/pom.xml

@@ -16,6 +16,7 @@
         <module>cms-framework-mvc</module>
         <module>cms-framework-base</module>
         <module>cms-framework-feign</module>
+        <module>cms-framework-redis</module>
     </modules>
     <artifactId>cms-framework</artifactId>
 

cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/HttpServletRequestFilter.java

@@ -2,9 +2,9 @@ package com.qs.serve.actuator;
 
 import com.qs.serve.common.utils.ServletUtils;
 import com.qs.serve.framework.base.config.DevEnvironmentConfig;
-import com.qs.serve.framework.base.framework.redis.RedisService;
 import com.qs.serve.framework.base.framework.security.model.LoginUser;
 import com.qs.serve.framework.base.util.DateUtils;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.Order;

cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityRequestFilter.java

@@ -3,12 +3,12 @@ package com.qs.serve.actuator;
 import com.qs.serve.framework.base.config.properties.AuthUrlConst;
 import com.qs.serve.framework.base.config.properties.PermitProperties;
 import com.qs.serve.framework.base.config.properties.ProjectProperties;
-import com.qs.serve.framework.base.framework.redis.RedisService;
 import com.qs.serve.framework.base.framework.security.model.LoginUser;
 import com.qs.serve.framework.base.framework.security.util.SecurityPermitUtil;
 import com.qs.serve.framework.base.model.HttpResponsePrintUtil;
 import com.qs.serve.framework.base.model.consts.GySysConst;
 import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.framework.base.util.JwtUtils;
 import com.qs.serve.modules.sys.service.SysUserService;

cms-modules/cms-basic/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cms-modules</artifactId>
+        <groupId>com.qs</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <packaging>pom</packaging>
+    <artifactId>cms-basic</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/TzcRebate.java

@@ -46,6 +46,8 @@ public class TzcRebate implements Serializable {
     @Length(max = 64,message = "返利抬头长度不能超过64字")
     private String rebateName;
 
+    private Integer rebateStatus;
+
     /** 返利开始时间 */
     @Length(max = 0,message = "返利开始时间长度不能超过0字")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/TzcRebateLevelsConfig.java

@@ -39,8 +39,8 @@ public class TzcRebateLevelsConfig implements Serializable {
     @NotNull(message = "坎级数字不能为空")
     private Integer levelNum;
 
-    /** 条件类型：0-同期进货金额；1-区间目标金额 */
+    /** 叠加配置 */
-    private Integer levelConfigs;
+    private String levelConfigs;
 
     /** 备注 */
     @Length(max = 255,message = "备注长度不能超过255字")

cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateLevelsConfigParam.java

@@ -25,7 +25,7 @@ public class TzcRebateLevelsConfigParam implements Serializable {
     private Integer levelNum;
 
     /** 坎级设置；格式如：1,3,5 */
-    private Integer levelConfigs;
+    private String levelConfigs;
 
 }
 

cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/enums/TzcRebateStatus.java

@@ -0,0 +1,41 @@
+package com.qs.serve.modules.tzc.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author YenHex
+ * @since 2025/4/18
+ */
+@Getter
+@AllArgsConstructor
+public enum TzcRebateStatus {
+
+    /**
+     * 返利状态：0-草稿，1-审批中，2-通过,待执行，3-完成；4-驳回，5-中止; 6-作废;
+     */
+    DRAFT(0),
+    APPLY(1),
+    PASS(2),
+    FINISH(3),
+    REJECT(4),
+    STOP(5),
+    CANCEL(6)
+    ;
+
+    public boolean isEqual(Integer status) {
+        return this.status.equals(status);
+    }
+
+    public static TzcRebateStatus getByStatus(Integer status) {
+        for (TzcRebateStatus value : values()) {
+            if (value.status.equals(status)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    private Integer status;
+
+}

cms-modules/cms-policy/cms-policy-bus/pom.xml

@@ -28,6 +28,11 @@
             <artifactId>cms-framework-mybatis-plus</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.qs</groupId>
+            <artifactId>cms-framework-redis</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.qs</groupId>
             <artifactId>cms-common</artifactId>

cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/api/TzcRebateApiImpl.java

@@ -1,13 +1,16 @@
 package com.qs.serve.modules.tzc.api;
 
+import com.qs.serve.common.utils.ServletUtils;
 import com.qs.serve.modules.tzc.entity.TzcRebate;
 import com.qs.serve.modules.tzc.service.TzcRebateService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 /**
  * @author YenHex
  * @since 2025/4/17
  */
+@Slf4j
 @Service
 public class TzcRebateApiImpl implements TzcRebateApi {
 
@@ -15,6 +18,8 @@ public class TzcRebateApiImpl implements TzcRebateApi {
 
     @Override
     public TzcRebate getRebateById(Long id) {
+        String userId = ServletUtils.getHeader("user-id");
+        log.warn("userId:{}",userId);
         return tzcRebateService.getById(id);
     }
 

cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java

@@ -1,12 +1,13 @@
 package com.qs.serve.modules.tzc.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.qs.serve.common.exception.Assert;
 import com.qs.serve.framework.base.model.ResultFlag;
-import com.qs.serve.modules.tzc.entity.bo.TzcRebateCenterParam;
+import com.qs.serve.modules.tzc.entity.TzcRebate;
-import com.qs.serve.modules.tzc.entity.bo.TzcRebateParam;
+import com.qs.serve.modules.tzc.entity.bo.*;
-import com.qs.serve.modules.tzc.entity.bo.TzcRebatePeriodParam;
+import com.qs.serve.modules.tzc.enums.TzcRebateStatus;
-import com.qs.serve.modules.tzc.entity.bo.TzcRebateSubjectParam;
 import com.qs.serve.modules.tzc.service.TzcRebateApplicationService;
+import com.qs.serve.modules.tzc.service.TzcRebateService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -23,8 +24,24 @@ import java.util.List;
 @AllArgsConstructor
 public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationService {
 
+    private final TzcRebateService tzcRebateService;
+
     @Override
     public Object modifyRebate(TzcRebateParam param) {
+
+        Long rebateId = param.getId();
+        String rebateCode = null;
+
+        if(rebateId!=null){
+            TzcRebate rebate = tzcRebateService.getById(rebateId);
+            if(TzcRebateStatus.DRAFT.isEqual(rebate.getRebateStatus())){
+                Assert.throwEx("返利状态为初始化，不能修改");
+            }
+            rebateCode = rebate.getRebateCode();
+        }else {
+            //rebateCode = CodeGenUtil.getDataCode(SourceDataKey.TZC_REBATE);
+        }
+
         BigDecimal oneHundred = new BigDecimal(100);
         List<TzcRebateSubjectParam> subjectParamList = param.getSubjectList();
         BigDecimal totalRate = BigDecimal.ZERO;
@@ -78,9 +95,48 @@ public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationServ
                 }
             }
             if(ResultFlag.isTrue(period.getCompensationFlag())){
+                if(period.getArgumentParam()==null){
+                    Assert.throwEx("["+period.getPeriodTitle()+"]返利补偿不能为空");
+                }
+            }
+        }
 
+        // 校验坎级叠加
+        if(ResultFlag.isTrue(param.getOverlayFlag())){
+            if(CollUtil.isEmpty(param.getConfigList())){
+                Assert.throwEx("坎级叠加标识为1时，坎级配置不能为空");
             }
         }
+
+
+
+        TzcRebate rebate = new TzcRebate();
+        rebate.setId(rebateId);
+        rebate.setRebateCode(rebateCode);
+
+//        rebate.setTemplateId();
+//        rebate.setTemplateName();
+
+        rebate.setRebateName(param.getRebateName());
+        rebate.setRebateStatus(TzcRebateStatus.DRAFT.getStatus());
+        rebate.setActivityStartTime(param.getActivityStartTime());
+        rebate.setActivityEndTime(param.getActivityEndTime());
+        rebate.setAutoDispatchFlag(param.getAutoDispatchFlag());
+        rebate.setCheckModel(param.getCheckModel());
+        rebate.setCheckMaxAmount(param.getCheckMaxAmount());
+        rebate.setCheckAutoDateType(param.getCheckAutoDateType());
+        rebate.setCheckStartDate(param.getCheckStartDate());
+        rebate.setCheckEndDate(param.getCheckEndDate());
+
+        rebate.setSupplierId(param.getSupplierId());
+
+        rebate.setSupplierCode();
+        rebate.setSupplierName();
+
+        rebate.setRebateAmount(param.getRebateAmount());
+        rebate.setOverlayFlag(param.getOverlayFlag());
+        rebate.setRemark(param.getRemark());
+
         return null;
     }
 

cms-modules/cms-system/pom.xml

@@ -35,6 +35,13 @@
             <artifactId>cms-framework-mybatis-plus</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.qs</groupId>
+            <artifactId>cms-framework-redis</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>com.qs</groupId>
             <artifactId>cms-framework-base</artifactId>

cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/consts/BirActivityCenterGoodsUtil.java

@@ -1,7 +1,7 @@
 package com.qs.serve.modules.bir.consts;
 
 import cn.hutool.core.collection.CollUtil;
-import com.qs.serve.framework.base.util.SpringUtils;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.modules.tbs.entity.TbsCostBirLog;
 import com.qs.serve.modules.tbs.mapper.TbsCostBirLogMapper;
 import lombok.extern.slf4j.Slf4j;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/common/BookAccountUtil.java

@@ -3,7 +3,7 @@ package com.qs.serve.modules.bms.common;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.framework.base.util.SpringUtils;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.modules.bms.entity.BmsAccountUser;
 import com.qs.serve.modules.bms.mapper.BmsAccountUserMapper;
 

cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java

@@ -12,6 +12,7 @@ import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.common.utils.TreeUtil;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
 import com.qs.serve.modules.bir.service.BirBudgetTargetService;
 import com.qs.serve.modules.bms.entity.*;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.qs.serve.common.exception.Assert;
-import com.qs.serve.framework.base.framework.redis.RedisService;
 import com.qs.serve.common.annotation.SysLog;
 import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
 import com.qs.serve.framework.base.model.PageVo;
@@ -17,6 +16,7 @@ import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.common.utils.TreeUtil;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
 import com.qs.serve.modules.bir.service.BirBudgetTargetService;
 import com.qs.serve.modules.bms.controller.my.BmsSupplierMyController;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/erp/service/impl/ErpCustomerServiceImpl.java

@@ -1,7 +1,7 @@
 package com.qs.serve.modules.erp.service.impl;
 
 import com.qs.serve.framework.base.framework.manager.AsyncManager;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.modules.sync.AsyncFactory;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.erp.entity.dto.ErpCustomerAmountResult;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuOptionController.java

@@ -6,7 +6,7 @@ import com.qs.serve.common.annotation.SysLog;
 import com.qs.serve.framework.base.model.R;
 import com.qs.serve.common.enums.BizType;
 import com.qs.serve.common.enums.SystemModule;
-import com.qs.serve.framework.base.util.SpringUtils;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.entity.GoodsSkuSpecValue;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java

@@ -3,6 +3,7 @@ package com.qs.serve.modules.goods.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.exception.Assert;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.framework.base.model.R;
 import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.CopierUtil;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
 import com.qs.serve.framework.base.model.PageVo;
 import com.qs.serve.framework.base.model.R;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java

@@ -3,7 +3,7 @@ package com.qs.serve.modules.his.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsRegionUser;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java

@@ -1,11 +1,11 @@
 package com.qs.serve.modules.oms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
 import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.framework.base.util.CodeGenUtil;
 import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.mapper.BmsRegionMapper;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@@ -4,11 +4,13 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.exception.Assert;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.common.utils.SpringUtils;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.R;
 import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
 import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierAddress;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java

@@ -1,11 +1,11 @@
 package com.qs.serve.modules.oms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
 import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.framework.base.util.CodeGenUtil;
 import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.mapper.BmsRegionMapper;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java

@@ -7,11 +7,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.util.StringUtil;
 import com.qs.serve.common.exception.Assert;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.common.utils.SpringUtils;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.R;
 import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
 import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierAddress;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/service/impl/SalePlanServiceImpl.java

@@ -1,8 +1,8 @@
 package com.qs.serve.modules.sale.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.framework.base.util.CodeGenUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.goods.entity.GoodsCategory;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonBaseService.java

@@ -1,6 +1,6 @@
 package com.qs.serve.modules.seeyon.service;
 
-import com.qs.serve.framework.base.util.SpringUtils;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.modules.sys.mapper.SysUserMapper;
 
 /**

cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java

@@ -1,9 +1,9 @@
 package com.qs.serve.modules.seeyon.service;
 
 import com.qs.serve.common.exception.Assert;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.framework.base.model.PageVo;
 import com.qs.serve.framework.base.model.R;
-import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.data.entity.DataAffairCommit;
 import com.qs.serve.modules.data.mapper.DataAffairCommitMapper;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/sync/AsyncFactory.java

@@ -1,10 +1,10 @@
 package com.qs.serve.modules.sync;
 
 
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.framework.base.util.SpringUtils;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
 import com.qs.serve.modules.sys.entity.SysOperationLog;
 import com.qs.serve.modules.sys.mapper.SysOperationLogMapper;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/common/AuthContextUtils.java

@@ -6,7 +6,7 @@ import com.qs.serve.framework.base.model.consts.GySysConst;
 import com.qs.serve.common.enums.HttpCode;
 import com.qs.serve.common.exception.Assert;
 import com.qs.serve.common.utils.ServletUtils;
-import com.qs.serve.framework.base.util.SpringUtils;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.common.context.SecurityUserUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.qs.serve.common.exception.Assert;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.framework.base.framework.security.model.LoginUser;
 import com.qs.serve.common.annotation.SysLog;
 import com.qs.serve.framework.base.model.consts.GySysConst;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserLoginServiceImpl.java

@@ -3,7 +3,7 @@ package com.qs.serve.modules.sys.service.impl;
 import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.exception.Assert;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.framework.base.framework.security.model.LoginUser;
 import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
 import com.qs.serve.framework.base.util.*;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.DesensitizedUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.framework.base.config.properties.SeeYonProperties;
 import com.qs.serve.common.exception.Assert;
 import com.qs.serve.framework.base.framework.security.model.LoginUser;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java

@@ -141,7 +141,7 @@ public class TagDataController {
      * @return
      */
     @DeleteMapping("deleteById/{id}")
-    public R<?> deleteById(@PathVariable String id){
+    public R<?> deleteById(@PathVariable Long id){
         tagDataService.removeById(id);
         return R.ok();
     }

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java

@@ -10,6 +10,7 @@ import com.qs.serve.common.enums.SystemModule;
 import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.tag.entity.TagCategory;
 import com.qs.serve.modules.tag.service.TagCategoryService;
 import lombok.AllArgsConstructor;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/BirHttpUtil.java

@@ -2,6 +2,7 @@ package com.qs.serve.modules.tbs.common.util;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.framework.base.config.properties.ProjectProperties;
 import com.qs.serve.framework.base.model.consts.GySysConst;
 import com.qs.serve.framework.base.model.R;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java

@@ -1,7 +1,7 @@
 package com.qs.serve.modules.tbs.common.util;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.framework.base.util.SpringUtils;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.modules.sys.entity.SysConfig;
 import com.qs.serve.modules.sys.service.SysConfigService;
 import com.qs.serve.modules.tbs.entity.TbsActivity;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetConditionUtil.java

@@ -1,7 +1,7 @@
 package com.qs.serve.modules.tbs.common.util;
 
 import com.qs.serve.framework.base.util.CollectionUtil;
-import com.qs.serve.framework.base.util.SpringUtils;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
 import com.qs.serve.modules.goods.entity.GoodsSku;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityPayConditionController.java

@@ -7,10 +7,10 @@ import com.qs.serve.framework.base.model.PageVo;
 import com.qs.serve.framework.base.model.R;
 import com.qs.serve.common.enums.BizType;
 import com.qs.serve.common.enums.SystemModule;
-import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetChangeController.java

@@ -1,10 +1,10 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.framework.base.framework.manager.AsyncManager;
 import com.qs.serve.framework.base.model.PageVo;
 import com.qs.serve.framework.base.model.R;
-import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.sync.AsyncFactory;
 import com.qs.serve.modules.sys.service.SysAttachService;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@@ -13,6 +13,7 @@ import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java

@@ -3,9 +3,9 @@ package com.qs.serve.modules.tbs.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.framework.base.model.PageVo;
 import com.qs.serve.framework.base.model.R;
-import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.service.SysAttachService;
 import com.qs.serve.modules.tbs.common.TbsCommonCheckState;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java

@@ -10,6 +10,7 @@ import com.qs.serve.framework.base.model.R;
 import com.qs.serve.framework.base.util.*;
 import com.qs.serve.framework.base.util.model.DateFormatString;
 import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.bms.entity.BmsSubject;
 import com.qs.serve.modules.bms.service.BmsSubjectService;
 import com.qs.serve.modules.goods.entity.GoodsCategory;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java

@@ -8,6 +8,7 @@ import com.qs.serve.framework.base.model.R;
 import com.qs.serve.framework.base.util.*;
 import com.qs.serve.framework.base.util.model.DateFormatString;
 import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.seeyon.entity.BaseCreateCallbackBo;
 import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java

@@ -6,12 +6,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.framework.base.config.properties.ProjectProperties;
 import com.qs.serve.common.exception.Assert;
 import com.qs.serve.framework.base.framework.manager.AsyncManager;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.R;
 import com.qs.serve.common.enums.BudgetLogOptFlag;
 import com.qs.serve.framework.base.util.*;
 import com.qs.serve.framework.base.util.model.DateFormatString;
 import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.bms.entity.BmsSubject;
 import com.qs.serve.modules.bms.service.BmsSubjectService;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
@@ -192,7 +193,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
                 Assert.throwEx("名称已存在");
             }
             budget = CopierUtil.copy(budgetBo,new TbsBudget());
-            budget.setBudgetNumber("BM"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Budget));
+            budget.setBudgetNumber("BM"+ CodeGenUtil.generate(CodeGenUtil.SourceKey.Budget));
         }
         List<Long> skuIds = budgetBo.getSkuIds();
         List<Long> spuIds = budgetBo.getSpuIds();

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java

@@ -3,6 +3,7 @@ package com.qs.serve.modules.tbs.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.serve.common.exception.Assert;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.framework.base.framework.manager.AsyncManager;
 import com.qs.serve.common.enums.BudgetLogOptFlag;
 import com.qs.serve.framework.base.model.consts.BudgetLogRollbackFlag;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java

@@ -3,11 +3,13 @@ package com.qs.serve.modules.tbs.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.serve.common.exception.Assert;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.common.utils.SpringUtils;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.R;
 import com.qs.serve.common.enums.BudgetLogOptFlag;
 import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsSubject;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -6,11 +6,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.framework.base.config.properties.ProjectApisProperties;
 import com.qs.serve.framework.base.config.properties.ProjectProperties;
 import com.qs.serve.common.exception.Assert;
 import com.qs.serve.framework.base.framework.manager.AsyncManager;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.common.enums.BudgetLogOptFlag;
 import com.qs.serve.framework.base.model.consts.BudgetLogRollbackFlag;
 import com.qs.serve.framework.base.model.R;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.framework.base.config.properties.ProjectProperties;
 import com.qs.serve.common.exception.Assert;
 import com.qs.serve.framework.base.model.R;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

@@ -11,6 +11,7 @@ import com.qs.serve.framework.base.model.ResultFlag;
 import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.service.*;
@@ -246,7 +247,7 @@ public class PortalOfCostApplication {
         Long supplierId = Long.parseLong(supplier.getId());
         BigDecimal totalAmount = createBo.getTotalAmount();
         String costTheme = createBo.getCostTheme();
-        String costApplyCode = "CA"+CodeGenUtil.generate(CodeGenUtil.SourceKey.CostApply);
+        String costApplyCode = "CA"+ CodeGenUtil.generate(CodeGenUtil.SourceKey.CostApply);
         String activityCode = costApplyCode + "_1";
         String activityTitle = "由政策"+policyItem.getPolicyItemCode()+"核销一站式API生成的活动";
 

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@@ -6,7 +6,7 @@ import com.qs.serve.framework.base.config.properties.ProjectApisProperties;
 import com.qs.serve.framework.base.config.properties.ProjectProperties;
 import com.qs.serve.common.exception.Assert;
 import com.qs.serve.framework.base.framework.manager.AsyncManager;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.consts.SysConfigKey;
 import com.qs.serve.common.enums.BudgetLogOptFlag;
 import com.qs.serve.framework.base.model.R;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyServiceImpl.java

@@ -3,7 +3,7 @@ package com.qs.serve.modules.tzc.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.framework.base.model.R;
-import com.qs.serve.framework.base.util.*;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
@@ -55,7 +55,7 @@ public class TzcPolicyServiceImpl extends ServiceImpl<TzcPolicyMapper,TzcPolicy>
             }
         }else {
             tzcPolicy = new TzcPolicy();
-            tzcPolicy.setPolicyCode("P"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Policy));
+            tzcPolicy.setPolicyCode("P"+ CodeGenUtil.generate(CodeGenUtil.SourceKey.Policy));
             SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
             tzcPolicy.setUserId(sysUser.getId());
             tzcPolicy.setUserCode(sysUser.getCode());

cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java

@@ -2,6 +2,7 @@ package com.qs.serve.modules.vtb.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.exception.Assert;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.framework.base.model.R;
 import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.CopierUtil;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java

@@ -3,6 +3,7 @@ package com.qs.serve.modules.vtb.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.exception.Assert;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.framework.base.model.R;
 import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.CopierUtil;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java

@@ -6,10 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.framework.base.config.properties.ProjectProperties;
 import com.qs.serve.common.exception.Assert;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.R;
 import com.qs.serve.framework.base.model.oa.OaFormMainProcess;
 import com.qs.serve.framework.base.model.oa.OaUploadFile;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.tag.util.TagFiledUtil;
 import com.qs.serve.framework.base.util.*;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java

@@ -3,6 +3,7 @@ package com.qs.serve.modules.vtb.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.qs.serve.common.exception.Assert;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.framework.base.util.*;
 import com.qs.serve.modules.seeyon.service.SeeYonOperationService;
 import com.qs.serve.modules.tbs.common.TbsActivityState;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -4,16 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.utils.SpringUtils;
 import com.qs.serve.framework.base.config.properties.ProjectApisProperties;
 import com.qs.serve.framework.base.config.properties.ProjectProperties;
 import com.qs.serve.common.exception.Assert;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.AmountDTO;
 import com.qs.serve.common.enums.BudgetLogOptFlag;
 import com.qs.serve.framework.base.model.R;
 import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.framework.redis.utils.CodeGenUtil;
 import com.qs.serve.modules.sync.AsyncFactory;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.tag.util.TagFiledUtil;
@@ -182,7 +184,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         verification.setCostApplyCode(costApply.getCode());
         verification.setAmountRecord(param.getTotalCheckAmount());
         verification.setAmount(param.getTotalCheckAmount());
-        verification.setVerificationCode("HX"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification));
+        verification.setVerificationCode("HX"+ CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification));
         verification.setVerificationMainCode(verification.getVerificationCode());
         verification.setVerificationState(VtbVerificationState.Finished.getCode());
         verification.setCostApplyId(costApply.getId());

cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java

@@ -1,7 +1,7 @@
 package com.qs.serve.modules.wx.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.framework.base.framework.security.model.LoginUser;
 import com.qs.serve.common.annotation.LimitSubmit;
 import com.qs.serve.common.annotation.SysLog;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxUserController.java

@@ -1,7 +1,7 @@
 package com.qs.serve.modules.wx.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
 import com.qs.serve.framework.base.model.PageVo;
 import com.qs.serve.framework.base.model.R;

cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/service/impl/WxUserServiceImpl.java

@@ -3,13 +3,13 @@ package com.qs.serve.modules.wx.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.exception.Assert;
-import com.qs.serve.framework.base.framework.redis.RedisService;
 import com.qs.serve.framework.base.model.consts.GySysConst;
 import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
 import com.qs.serve.common.enums.HttpCode;
 import com.qs.serve.framework.base.util.*;
 import com.qs.serve.common.utils.ServletUtils;
 import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.framework.redis.RedisService;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.mapper.SysUserMapper;

cms-modules/pom.xml

@@ -14,6 +14,7 @@
         <module>cms-system</module>
         <module>cms-actuator</module>
         <module>cms-policy</module>
+        <module>cms-basic</module>
     </modules>
     <artifactId>cms-modules</artifactId>