opt: 临期品折扣逻辑更变；客户同步拓展修复接口

- 新增用户维度的商品授权相关实体类、控制器和服务
- 实现用户维度商品授权的保存、查询等核心业务逻辑
- 优化商品授权信息的获取，支持按不同维度进行查询
- 重构订单创建流程，增加品牌类别和自定义区域信息
- 修复微信用户转换为公众号用户的相关问题

.gitignore

@@ -6,3 +6,4 @@ gyoa-java.iml
 *.env.json
 *.json
 /src/test/
+questionnaire.iml

doc/update.sql

@@ -0,0 +1,25 @@
+
+update tbs_budget_condition set brand_id = SUBSTRING_INDEX(target_level_path_ids,'_',1)
+update tbs_budget set center_combo = concat(center_type,'_',center_id)
+
+update vtb_verification v
+    left join tbs_activity act on act.id = v.activity_id
+    set v.activity_code = act.activity_code
+where v.verification_main_code like 'DHX%'
+
+
+select tbs_budget.id from  tbs_budget
+LEFT JOIN tbs_budget_condition
+ on tbs_budget_condition.budget_id = tbs_budget.id
+where tbs_budget.del_flag = 0
+  and tbs_budget_condition.del_flag = 0
+  and tbs_budget.condition_flag = 0
+  and tbs_budget_condition.id is not null
+GROUP BY tbs_budget.id
+
+
+
+update tbs_budget set condition_flag = 1
+where id in (
+    )
+

pom.xml

@@ -24,12 +24,32 @@
         <httpclient.version>4.5.7</httpclient.version>
         <commons-httpclient.version>3.1</commons-httpclient.version>
         <fastjson.version>1.2.49</fastjson.version>
-        <mybatis-plus.version>3.4.1</mybatis-plus.version>
+        <mybatis-plus.version>3.5.2</mybatis-plus.version>
         <skipTests>true</skipTests>
         <wx.java.version>4.2.0</wx.java.version>
+        <lib.dir>D:\workspace-main\JiaShiLi\jsl-questionnaire-base\src\main\resources\lib\</lib.dir>
     </properties>
 
     <dependencies>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.10.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.13.0</version>
+        </dependency>
+
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
@@ -106,10 +126,11 @@
             <version>${fastjson.version}</version>
         </dependency>
 
+
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.4.1</version>
+            <version>1.4.4</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.mybatis</groupId>
@@ -119,12 +140,18 @@
                     <groupId>org.mybatis</groupId>
                     <artifactId>mybatis</artifactId>
                 </exclusion>
-                <exclusion>
+<!--                <exclusion>-->
-                    <groupId>com.github.jsqlparser</groupId>
+<!--                    <groupId>com.github.jsqlparser</groupId>-->
-                    <artifactId>jsqlparser</artifactId>
+<!--                    <artifactId>jsqlparser</artifactId>-->
-                </exclusion>
+<!--                </exclusion>-->
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>${mybatis-plus.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
@@ -137,11 +164,17 @@
             <version>8.0.15</version>
         </dependency>
 
-<!--        <dependency>-->
+        <dependency>
-<!--            <groupId>com.microsoft.sqlserver</groupId>-->
+            <groupId>com.microsoft.sqlserver</groupId>
-<!--            <artifactId>mssql-jdbc</artifactId>-->
+            <artifactId>mssql-jdbc</artifactId>
-<!--            <version>6.4.0.jre8</version>-->
+            <version>8.4.1.jre8</version>
-<!--        </dependency>-->
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-indexer</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -162,6 +195,12 @@
             <version>${wx.java.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-cp</artifactId>
+            <version>${wx.java.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -188,6 +227,18 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.16.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.10</version>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/com/qs/serve/Application.java

@@ -1,6 +1,9 @@
 package com.qs.serve;
 
 import com.qs.serve.common.config.DevEnvironmentConfig;
+import com.qs.serve.task.TbsTask;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -8,8 +11,10 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
+import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.stereotype.Indexed;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import javax.annotation.PostConstruct;
@@ -21,6 +26,7 @@ import java.util.TimeZone;
  * @author YenHex
  * @since 2022/2/24
  */
+@Indexed
 @EnableAsync
 @EnableScheduling
 @EnableTransactionManagement
@@ -28,9 +34,21 @@ import java.util.TimeZone;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
 
+    @Value("${project.dev}")
+    String dev;
+
     public static void main(String[] args) {
-        DevEnvironmentConfig.openDevEnv(true);
+        long start = System.currentTimeMillis();
         SpringApplication.run(Application.class,args);
+        long end = System.currentTimeMillis();
+        double diff = (end-start)/1000.0;
+        System.out.println("启动时间："+diff
+             +"\n  ____   _                _                                                           __         _  _ \n" +
+                " / ___| | |_  __ _  _ __ | |_   _   _  _ __    ___  _   _   ___  ___  ___  ___  ___  / _| _   _ | || |\n" +
+                " \\___ \\ | __|/ _` || '__|| __| | | | || '_ \\  / __|| | | | / __|/ __|/ _ \\/ __|/ __|| |_ | | | || || |\n" +
+                "  ___) || |_| (_| || |   | |_  | |_| || |_) | \\__ \\| |_| || (__| (__|  __/\\__ \\\\__ \\|  _|| |_| || ||_|\n" +
+                " |____/  \\__|\\__,_||_|    \\__|  \\__,_|| .__/  |___/ \\__,_| \\___|\\___|\\___||___/|___/|_|   \\__,_||_|(_)\n" +
+                "                                      |_|                             \n");
     }
 
     @Override
@@ -46,6 +64,7 @@ public class Application extends SpringBootServletInitializer {
     @PostConstruct
     void started() {
         TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
+        DevEnvironmentConfig.openDevEnv(dev.equals("true"));
     }
 
 }

src/main/java/com/qs/serve/common/config/DevEnvironmentConfig.java

@@ -1,24 +1,33 @@
 package com.qs.serve.common.config;
 
+import com.qs.serve.common.util.Assert;
 import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @author YenHex
  * @since 2022/3/11
  */
+@Slf4j
 @UtilityClass
 public class DevEnvironmentConfig {
 
     private static Boolean devEnv = null;
     public static void openDevEnv(Boolean open){
-        if(devEnv==null){devEnv = open;}
+        log.warn("环境变量：devEnv=>>> "+open);
+        devEnv = open;
     }
 
-
+    public static Boolean isDev(){
-    public static boolean isDev(){
         if(devEnv==null){
-            return false;
+            Assert.throwEx("资源加载中...");
         }
         return devEnv;
     }
+
+    /**
+     * 开启账套
+     */
+    public final static boolean OPEN_TENANT_BOOK = true;
+
 }

src/main/java/com/qs/serve/common/config/JwtConfig.java

@@ -14,10 +14,10 @@ public class JwtConfig {
     /**
      * 单位分钟
      */
-    private final Integer expire = 60;
+    private final Integer expire = 7;
 
     private final String iss = "KP_ISS";
 
-    private final String secret = "QiShenAa18n9VUcCxaSeSqLtFvsSCaRoVPKtBLaYxB0";
+    private final String secret = "QiShenAa18n9VUcCxaSeSqLtFvsSCaRoVPKtBLaYxB0123456";
 
 }

src/main/java/com/qs/serve/common/config/MyBatisConfig.java

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.DynamicTableNameInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
 import com.qs.serve.common.framework.mybatis.handler.SysMetaHandler;
 import com.qs.serve.common.framework.mybatis.handler.SysTenantHandler;
+import com.qs.serve.common.framework.mybatis.handler.meta.TableNameAppendHandler;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -27,6 +29,10 @@ public class MyBatisConfig {
         interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
         // 多租户、乐观锁等配置拦截
         interceptor.addInnerInterceptor(buildTenantHandler());
+        // 添加动态表名插件
+//        DynamicTableNameInnerInterceptor dynamicTableNameInnerInterceptor = new DynamicTableNameInnerInterceptor();
+//        dynamicTableNameInnerInterceptor.setTableNameHandler(tableNameAppendHandler());
+//        interceptor.addInnerInterceptor(dynamicTableNameInnerInterceptor);
         // 添加防止全表更新与删除拦截器
         interceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
         return interceptor;
@@ -37,6 +43,15 @@ public class MyBatisConfig {
         return new SysMetaHandler();
     }
 
+
+//    public TableNameAppendHandler tableNameAppendHandler(){
+//        TableNameAppendHandler tableNameAppendHandler = new TableNameAppendHandler(
+//                "oms_sale_order",
+//                "oms_sale_order_item"
+//        );
+//        return tableNameAppendHandler;
+//    }
+
     public TenantLineInnerInterceptor buildTenantHandler(){
         String[] ignoreTable = new String[]{
                 "sys_user",
@@ -45,7 +60,9 @@ public class MyBatisConfig {
                 "sys_tenant",
                 "wx_app",
                 "sys_menu",
-                "sys_menu_permit"
+                "sys_menu_permit",
+                "sys_request_log",
+                "bir_budget_target"
         };
         SysTenantHandler sysTenantHandler = new SysTenantHandler(ignoreTable);
         return new TenantLineInnerInterceptor(sysTenantHandler);

src/main/java/com/qs/serve/common/config/RedisConfig.java

@@ -1,6 +1,13 @@
 package com.qs.serve.common.config;
 
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
@@ -16,8 +23,12 @@ import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.data.redis.serializer.*;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
 import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
 
 
 /**
@@ -43,6 +54,19 @@ public class RedisConfig extends CachingConfigurerSupport{
                 .build();
     }
 
+//    @Bean
+//    public ObjectMapper objectMapper(Jackson2ObjectMapperBuilder builder) {
+//        JavaTimeModule module = new JavaTimeModule();
+//        DateTimeFormatter formatter = new DateTimeFormatterBuilder()
+//                .appendPattern("yyyy-MM-dd HH:mm:ss").toFormatter();
+//        module.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(formatter));
+//        module.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(formatter));
+//        ObjectMapper objectMapper = builder.createXmlMapper(false).build();
+//        objectMapper.registerModule(new JavaTimeModule());
+//        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+//        return objectMapper;
+//    }
+
     @Bean
     public RedisMessageListenerContainer container(RedisConnectionFactory connectionFactory){
         RedisMessageListenerContainer container = new RedisMessageListenerContainer();

src/main/java/com/qs/serve/common/config/SpringMvcConfig.java

@@ -1,8 +1,10 @@
 package com.qs.serve.common.config;
 
-import com.qs.serve.common.framework.interceptor.ApiAuthInterceptor;
+import com.qs.serve.common.config.properties.ProjectProperties;
 import com.qs.serve.common.framework.interceptor.LimitSubmitInterceptor;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;
@@ -11,34 +13,37 @@ import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
  * @author YenHex
  * @since 2022/2/24
  */
+@Slf4j
 @AllArgsConstructor
 @Configuration(proxyBeanMethods = false)
 public class SpringMvcConfig implements WebMvcConfigurer {
 
     private final LimitSubmitInterceptor limitSubmitInterceptor;
-    private final ApiAuthInterceptor apiAuthInterceptor;
+    //private final ApiAuthInterceptor apiAuthInterceptor;
+
+    private final ProjectProperties projectProperties;
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        //注册LimitSubmitInterceptor拦截器
-        registry.addInterceptor(apiAuthInterceptor)
-                .addPathPatterns("/api/**")
-                .excludePathPatterns("/api/wx/login/*","/api/dev/**");
         registry.addInterceptor(limitSubmitInterceptor)
                 .addPathPatterns("/**");
     }
 
-    /*@Override
+    @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        log.warn("PcWebLocal==>{}",projectProperties.getPcWebLocal());
+        registry.addResourceHandler("/web/**")
+                .addResourceLocations("file:"+projectProperties.getPcWebLocal());
         registry.addResourceHandler("/static/**")
-                .addResourceLocations("classpath:/static/");
+                .addResourceLocations("file:"+projectProperties.getPcWebLocal()+"static/");
-    }*/
+    }
 
     @Bean
     public CorsFilter corsFilter() {

src/main/java/com/qs/serve/common/config/properties/AliYunOssProperties.java

@@ -0,0 +1,25 @@
+package com.qs.serve.common.config.properties;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author: YenHex
+ * @Date: 2021/3/3
+ * @Version: 1.0
+ **/
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "aliyun.oss")
+public class AliYunOssProperties {
+
+    private String bucket;
+    private String accessKeyId;
+    private String accessKeySecret;
+    private String endpoint;
+    private String prefix;
+
+}

src/main/java/com/qs/serve/common/config/properties/AuthUrlConst.java

@@ -0,0 +1,13 @@
+package com.qs.serve.common.config.properties;
+
+/**
+ * @author YenHex
+ * @since 2024/3/27
+ */
+public class AuthUrlConst {
+
+    public final static String[] AUTH_ALLOW_URL = new String[]{
+        "bir/"
+    };
+
+}

src/main/java/com/qs/serve/common/config/properties/ProjectApisProperties.java

@@ -0,0 +1,36 @@
+package com.qs.serve.common.config.properties;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author YenHex
+ * @since 2023/9/7
+ */
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "project.apis")
+public class ProjectApisProperties {
+
+    /** 支付接口 */
+    private String costToPay;
+
+    /** 同步核销的支付状态 */
+    private String checkPayStatus;
+
+    /** 调度系统-发货单 */
+    private String diaoduPlanOrder;
+
+    /** 嘉士利接口，spu转换sku */
+    private String spuToSku;
+
+    /**
+     * 原是生成销路通apt的中间表，替换伟成的接口直接生成
+     */
+    private String policySyncCate;
+
+    private String policySyncInv;
+}

src/main/java/com/qs/serve/common/config/properties/ProjectProperties.java

@@ -0,0 +1,31 @@
+package com.qs.serve.common.config.properties;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author: YenHex
+ * @Date: 2021/3/3
+ * @Version: 1.0
+ **/
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "project")
+public class ProjectProperties {
+
+    private String closeAuth;
+
+    private String birService;
+
+    private String birServiceUrl;
+
+    private String hostUrl;
+
+    private String webUrl;
+
+    private String pcWebLocal;
+
+}

src/main/java/com/qs/serve/common/config/properties/QiShengDsProperties.java

@@ -0,0 +1,22 @@
+package com.qs.serve.common.config.properties;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author YenHex
+ * @since 2024/6/18
+ */
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.qisheng")
+public class QiShengDsProperties {
+
+    private String url;
+    private String username;
+    private String password;
+
+}

src/main/java/com/qs/serve/common/config/properties/SeeYonProperties.java

@@ -0,0 +1,28 @@
+package com.qs.serve.common.config.properties;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: YenHex
+ * @Date: 2021/3/3
+ * @Version: 1.0
+ **/
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "project.seeyon")
+public class SeeYonProperties {
+
+    private Boolean enable;
+
+    private String url;
+
+    private String extApi;
+
+}

src/main/java/com/qs/serve/common/framework/annotations/RedisCacheable.java

@@ -0,0 +1,35 @@
+package com.qs.serve.common.framework.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * 解决原有@CacheAble不支持独立失效策略场景
+ * @author YenHex
+ * @since 2024/10/17
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RedisCacheable {
+
+    /**
+     * redis缓存前缀，默认类与方法名
+     * @return
+     */
+    String prefix() default "";
+
+    /**
+     * 过期时间
+     * @return
+     */
+    int expire() default 350;
+
+    /**
+     * 缓存读取主键表达式
+     * @return
+     */
+    String expression() default "";
+
+    String SIMPLE_KEY = "#key";
+
+}

src/main/java/com/qs/serve/common/framework/annotations/TagField.java

@@ -0,0 +1,4 @@
+package com.qs.serve.common.framework.annotations;
+
+public @interface TagField {
+}

src/main/java/com/qs/serve/common/framework/aop/RedisCacheAspect.java

@@ -0,0 +1,135 @@
+package com.qs.serve.common.framework.aop;
+
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.qs.serve.common.framework.annotations.RedisCacheable;
+import com.qs.serve.common.framework.redis.RedisService;
+import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.common.util.StringUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author YenHex
+ * @since 2024/10/18
+ */
+@Slf4j
+//@Aspect
+//@Component
+@AllArgsConstructor
+public class RedisCacheAspect {
+
+    private final RedisService redisService;
+
+    @Pointcut("@annotation(com.qs.serve.common.framework.annotations.RedisCacheable)")
+    public void PointCut() {}
+
+    @Around("PointCut()")
+    public Object redisCacheAdvice(ProceedingJoinPoint joinPoint) throws Throwable {
+        Object[] args = joinPoint.getArgs();
+        Signature signature = joinPoint.getSignature();
+        MethodSignature methodSignature = ((MethodSignature) signature);
+        Method method = methodSignature.getMethod();
+        RedisCacheable redisCacheable = AnnotatedElementUtils.findMergedAnnotation(method, RedisCacheable.class);
+        if(redisCacheable!=null){
+            String prefix = StringUtils.hasText(redisCacheable.prefix()) ? redisCacheable.prefix()
+                    :  methodSignature.getDeclaringType().getName() +"."+ methodSignature.getMethod().getName()+"()";
+            //构建表达式key
+            String pk = this.getPrimaryKey(methodSignature,redisCacheable,args);
+            String redisCacheKey = "RCache:" + prefix + (pk==null?"":pk);
+            Object result = redisService.get(redisCacheKey);
+            if(result!=null){
+                return JsonUtil.jsonToMap(result.toString());
+            }
+            result = joinPoint.proceed(args);
+            if(result!=null){
+                redisService.set(redisCacheKey,JsonUtil.objectToJson(result),redisCacheable.expire(), TimeUnit.MILLISECONDS);
+            }
+            return result;
+        }
+        // 返回默认对象
+        return joinPoint.proceed(args);
+    }
+
+    public String getPrimaryKey(MethodSignature methodSignature,RedisCacheable annotation,Object[] args){
+        String method = methodSignature.getDeclaringType().getName()
+                +"."+ methodSignature.getMethod().getName()+"()";
+        final String expression = annotation.expression();
+        //适配表达式读取key，key读取不到log.error，放行请求
+        String primaryKey = null;
+        if(StringUtils.isNotEmpty(expression)){
+            //
+            if(expression.equals(RedisCacheable.SIMPLE_KEY)&&args.length==1){
+                return args[0].toString();
+            }
+            List<String> keys = new ArrayList<>();
+            // 指定表名
+            String tableName = null;
+            if(expression.contains(StringPool.DOT)){
+                String[] keyArr = expression.split(StringPool.BACK_SLASH + StringPool.DOT);
+                for (String key : keyArr) {
+                    if(key.contains(StringPool.DOLLAR)){
+                        tableName = key.replace(StringPool.DOLLAR,"");
+                        continue;
+                    }
+                    keys.add(key);
+                }
+            }else {
+                keys.add(expression);
+            }
+            for (Object arg : args) {
+                // 跳过非指定的表名
+                if(tableName!=null){
+                    String clazzName = arg.getClass().getSimpleName();
+                    if(!clazzName.equals(tableName)){
+                        continue;
+                    }
+                }
+                // 读取key
+                primaryKey = getPrimaryKeyRecursion(keys, arg, 0);
+            }
+            if(primaryKey==null){
+                log.error("LockSubmitAspect失效，方法：{} 无法读取主键：{}",method,expression);
+            }
+        }
+        return primaryKey;
+    }
+
+
+    /**
+     * 递归读取主键
+     * @param keys
+     * @param arg
+     * @param startIndex
+     * @return
+     */
+    private String getPrimaryKeyRecursion(List<String> keys, Object arg, int startIndex) {
+        String key = keys.get(startIndex);
+        Map<String,Object> param = JsonUtil.jsonToMap(JsonUtil.objectToJson(arg));
+        Object val = param.get(key);
+        if(val!=null){
+            boolean isLast = startIndex + 1== keys.size();
+            if(isLast){
+                return val.toString();
+            }else {
+                // 自调支持无限层级
+                return getPrimaryKeyRecursion(keys, val, startIndex + 1 );
+            }
+        }
+        return null;
+    }
+
+}

src/main/java/com/qs/serve/common/framework/aop/SysLogAspect.java

@@ -80,7 +80,24 @@ public class SysLogAspect {
             if (controllerLog == null) {
                 return;
             }
+
             HttpServletRequest request = ServletUtils.getRequest();
+
+            //耗时
+            Long startTime = startTimeIndex.get();
+            Long diffTime = null;
+            boolean isLongTime = false;
+            if(startTime!=null){
+                diffTime = System.currentTimeMillis()-startTime;
+                if(diffTime>10000){
+                    isLongTime = true;
+                }
+            }
+
+            //GET只保存请求时间长的请求
+            if(request.getMethod().equals("GET") && !isLongTime){
+                return;
+            }
             // 获取当前的用户
             LoginUser loginUser = AuthContextUtils.getLoginUser(false);
             SysOperationLog operLog = new SysOperationLog();
@@ -100,12 +117,10 @@ public class SysLogAspect {
             if (e != null) {
                 operLog.setErrMsg(StringUtils.substring(e.getMessage(), 0, 2500));
             }
-            //耗时
+            if(diffTime!=null){
-            Long startTime = startTimeIndex.get();
+                operLog.setElapsedTime(diffTime);
-            if(startTime!=null){
-                operLog.setElapsedTime(System.currentTimeMillis()-startTime);
             }else {
-                operLog.setElapsedTime(0L);
+                operLog.setElapsedTime(-1L);
             }
             String className = joinPoint.getTarget().getClass().getName();
             String methodName = joinPoint.getSignature().getName();

src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java

@@ -5,11 +5,13 @@ import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.HttpCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DuplicateKeyException;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Component;
+import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindException;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.servlet.http.HttpServletRequest;
 import java.sql.SQLIntegrityConstraintViolationException;
 
 
@@ -33,14 +36,16 @@ public class UnifiedExceptionHandler {
 
     @ExceptionHandler(value = BusinessException.class)
     @ResponseBody
-    public R handleBindException(BusinessException e) {
+    public R handleBindException(BusinessException e,HttpServletRequest request) {
+        log.warn("自定义异常触发【{},{}】，请求地址：{}",e.getCode(),e.getMessage(),request.getRequestURI());
         return new R(e.getCode(),e.getMessage());
     }
 
     @ExceptionHandler(value = NullPointerException.class)
     @ResponseBody
-    public R handleBindException(NullPointerException e) {
+    public R handleBindException(NullPointerException e,HttpServletRequest request) {
         e.printStackTrace();
+        log.error("空指针【{}】，请求地址：{}",e.getMessage(),request.getRequestURI());
         return R.error("数据不存在或被移除");
     }
 
@@ -48,8 +53,9 @@ public class UnifiedExceptionHandler {
             AccessDeniedException.class
     })
     @ResponseBody
-    public R handleAccessException(AccessDeniedException e) {
+    public R handleAccessException(AccessDeniedException e,HttpServletRequest request) {
         HttpCode hc = HttpCode.FORBIDDEN_403;
+        log.error("访问拦截【{}】，请求地址：{}",e.getMessage(),request.getRequestURI());
         return new R(hc.getCode(),hc.getMsg());
     }
 
@@ -73,27 +79,50 @@ public class UnifiedExceptionHandler {
 
     @ExceptionHandler({
         BindException.class,
-        MethodArgumentNotValidException.class,
         HttpRequestMethodNotSupportedException.class
     })
     @ResponseBody
-    public R handleDevPrintMsgException(Exception e) {
+    public R handleDevPrintMsgException(Exception e,HttpServletRequest request) {
-        log.warn("参数校验异常：{}",e.getMessage());
+        log.error("参数校验异常：{}",e.getMessage());
-        if(DevEnvironmentConfig.isDev()){return R.error(e.getMessage());}
+        if(DevEnvironmentConfig.isDev()){
+            return R.error(e.getMessage());
+        }
         return R.error();
     }
 
     @ExceptionHandler({
-            DuplicateKeyException.class,
+            MethodArgumentNotValidException.class,
+    })
+    @ResponseBody
+    public R handleMethodArgumentNotValidException(MethodArgumentNotValidException e,HttpServletRequest request) {
+        log.error("参数校验异常【{}】，请求地址：{}",e.getMessage(),request.getRequestURI());
+        return R.error(e.getBindingResult().getAllErrors().get(0).getDefaultMessage());
+    }
+
+
+    @ExceptionHandler(value = DuplicateKeyException.class)
+    @ResponseBody
+    public R handleDuplicateKeyException(DuplicateKeyException e,HttpServletRequest request) {
+        log.error("限制重复数据【{}】，请求地址：{}",e.getMessage(),request.getRequestURI());
+        e.printStackTrace();
+        return R.error("限制重复数据，请联系管理员");
+    }
+
+    @ExceptionHandler(value = HttpMessageNotReadableException.class)
+    @ResponseBody
+    public R handleHttpMessageNotReadableException(HttpMessageNotReadableException e,HttpServletRequest request) {
+        log.error("请求参数无法解析【{}】，请求地址：{}",e.getMessage(),request.getRequestURI());
+        return R.error("请求参数无法解析");
+    }
+
+    @ExceptionHandler({
             SQLIntegrityConstraintViolationException.class,
     })
     @ResponseBody
-    public R handleSqlIntegrityException(Exception e) {
+    public R handleSqlIntegrityException(Exception e,HttpServletRequest request) {
-        String msg = e.getMessage();
+        log.warn("数据库拦截【{}】，请求地址：{}",e.getMessage(),request.getRequestURI());
         e.printStackTrace();
-        String[] tmps = msg.split("\\n");
+        return new R(500,"数据库拦截，请联系管理员");
-        String msg2 = tmps.length>1?tmps[1]:null;
-        return new R(500,"数据库拦截"+(msg2==null?"":" : "+msg2));
     }
 
     /**
@@ -109,8 +138,9 @@ public class UnifiedExceptionHandler {
 
     @ExceptionHandler(value = Exception.class)
     @ResponseBody
-    public R handleException(Exception e) {
+    public R handleException(Exception e,HttpServletRequest request) {
-        log.error("Servlet异常\n异常类型：{}\n异常信息：{}\n异常体：",e.getClass().getSimpleName(),e.getMessage(),e);
+        log.error("Servlet异常\n请求地址：{},异常类型：{}\n异常信息：{}\n异常体：",request.getRequestURI(),e.getClass().getSimpleName(),e.getMessage(),e);
+        e.printStackTrace();
         if(DevEnvironmentConfig.isDev()){return R.error(e.getMessage());}
         return R.error();
     }

src/main/java/com/qs/serve/common/framework/interceptor/ApiAuthInterceptor.java

@@ -1,60 +0,0 @@
-package com.qs.serve.common.framework.interceptor;
-
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.framework.security.model.LoginUser;
-import com.qs.serve.common.framework.security.model.LoginUserDTO;
-import com.qs.serve.common.model.consts.GySysConst;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
-import com.qs.serve.common.util.JsonUtil;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
-import org.springframework.web.servlet.HandlerInterceptor;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * API接口身份拦截器
- * @author YenHex
- */
-@Configuration(proxyBeanMethods = false)
-public class ApiAuthInterceptor implements HandlerInterceptor {
-
-
-    @Resource private RedisService redisService;
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-        String token = request.getHeader(GySysConst.APP_TOKEN_PROP);
-        String loginUserJson = redisService.getString(RedisCacheKeys.LOGIN_KEY_WX+token);
-        if(loginUserJson!=null){
-            LoginUser loginUser = Objects.requireNonNull(JsonUtil.jsonToPojo(loginUserJson, LoginUserDTO.class)).loginUser();
-            UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
-            authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
-            SecurityContextHolder.getContext().setAuthentication(authentication);
-            return true;
-        }
-        try {
-            response.setHeader("Access-Control-Allow-Origin", "*");
-            response.setHeader("Access-Control-Allow-Credentials", "true");
-            response.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS");
-            response.setHeader("Access-Control-Max-Age", "86400");
-            response.setHeader("Access-Control-Allow-Headers", "*");
-            response.setStatus(200);
-            response.setCharacterEncoding("UTF-8");
-            response.setCharacterEncoding("UTF-8");
-            response.setContentType("application/json;charset=UTF-8");
-            response.getWriter().print("{\"status\":401,\"msg\":\"用户信息无效或过期了\"}");
-            response.getWriter().flush();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-}

src/main/java/com/qs/serve/common/framework/interceptor/LocalDateTimeFormatSerializer.java

@@ -0,0 +1,31 @@
+package com.qs.serve.common.framework.interceptor;
+
+import com.alibaba.fastjson.serializer.JSONSerializer;
+import com.alibaba.fastjson.serializer.ObjectSerializer;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+/**
+ * @author YenHex
+ * @since 2024/7/18
+ */
+public class LocalDateTimeFormatSerializer implements ObjectSerializer {
+
+    @Override
+    public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, int features) throws IOException {
+        if (object == null) {
+            serializer.out.writeNull();
+            return;
+        }
+        LocalDateTime date = (LocalDateTime) object;
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String timeString = formatter.format(date);
+        serializer.write(timeString);
+    }
+
+}

src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java

@@ -1,19 +1,49 @@
 package com.qs.serve.common.framework.manager;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.config.DevEnvironmentConfig;
+import com.qs.serve.common.framework.redis.RedisService;
+import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.JsonUtil;
 import com.qs.serve.common.util.SpringUtils;
+import com.qs.serve.modules.data.entity.DataAffairCommit;
+import com.qs.serve.modules.data.service.DataAffairCommitService;
+import com.qs.serve.modules.seeyon.service.SeeYonOperationService;
+import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
+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;
+import com.qs.serve.modules.tbs.entity.TbsBudget;
+import com.qs.serve.modules.tbs.entity.TbsCostApply;
+import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
+import com.qs.serve.modules.tbs.service.impl.TbsBudgetApplyOperationServiceImpl;
+import com.qs.serve.modules.tbs.service.impl.TbsBudgetBatchOperationServiceImpl;
+import com.qs.serve.modules.tbs.service.impl.TbsBudgetChangeOperationServiceImpl;
+import com.qs.serve.modules.tbs.service.impl.TbsCostApplyOperationServiceImpl;
+import com.qs.serve.modules.tzc.service.impl.TzcPolicyOperationServiceImpl;
+import com.qs.serve.modules.vtb.common.VtbVerificationState;
+import com.qs.serve.modules.vtb.entity.VtbVerification;
+import com.qs.serve.modules.vtb.service.VtbVerificationApplication;
+import com.qs.serve.modules.vtb.service.VtbVerificationService;
+import com.qs.serve.modules.vtb.service.impl.VtbVerificationOperationServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeansException;
+import org.springframework.scheduling.annotation.Async;
 
+import java.math.BigDecimal;
 import java.util.TimerTask;
+import java.util.concurrent.TimeUnit;
+
+import static com.qs.serve.modules.tbs.common.TbsSeeYonConst.ERP_CUS_AMOUNT;
 
 /**
  * 异步工厂
  * @author YenHex
  * @since 2022/2/24
  */
+@Slf4j
 public class AsyncFactory {
 
     /**
@@ -25,12 +55,246 @@ public class AsyncFactory {
         return new TimerTask() {
             @Override
             public void run() {
-                if(DevEnvironmentConfig.isDev()){
-                    System.out.println(JsonUtil.objectToJson(operationLog));
-                }
                 SpringUtils.getBean(SysOperationLogMapper.class).saveLog(operationLog);
             }
         };
     }
 
+    /**
+     * 异步保存政策状态
+     * @param userId
+     * @param supplierCode
+     * @return
+     */
+    public static TimerTask initCustomerPrice(String userId,String supplierCode) {
+        return new TimerTask() {
+            @Override
+            public void run() {
+                getCumSurplusPrice(userId, supplierCode);
+            }
+
+        };
+    }
+
+    /**
+     * 获取客户帐余
+     * @param userId
+     * @param supplierCode
+     * @return
+     */
+    public static String getCumSurplusPrice(String userId, String supplierCode) {
+        String lockKey = "customer_price_lock:"+userId+":"+supplierCode;
+        String priceDataKey = "customer_price_data:"+userId;
+        RedisService redisService = SpringUtils.getBean(RedisService.class);
+        redisService.set(lockKey,1,30,TimeUnit.SECONDS);
+        log.debug("获取客户金额，cusCode：{}",supplierCode);
+        //请求获取金额
+        SeeYonRequestBaseService seeYonRequestService = SpringUtils.getBean(SeeYonRequestBaseService.class);
+        R<String> reqResult = seeYonRequestService.getBase(ERP_CUS_AMOUNT+"?supplierCode="+supplierCode,"获取客户["+supplierCode+"]金额");
+        if(reqResult==null || !reqResult.getStatus().equals(200)){
+            //有错误退出
+            log.warn("获取客户金额失败，cusCode：{}",supplierCode);
+            redisService.set(lockKey,0);
+            return "-1";
+        }
+        String amount = reqResult.getData()==null?"0":reqResult.getData();
+        //数据格式：supplierCode_&_amount 如 A235654_&_612.00
+        String value = supplierCode+"_&_"+amount;
+        //缓存15分钟
+        log.debug("获取客户金额成功，cusCode：{},缓存15分钟",supplierCode);
+        redisService.set(priceDataKey,value,15, TimeUnit.MINUTES);
+        redisService.set(lockKey,0);
+
+        //
+        return amount;
+    }
+
+    /**
+     * 异步保存政策状态
+     * @param policyId
+     * @return
+     */
+    public static TimerTask submitPolicy(Long policyId) {
+        return new TimerTask() {
+            @Override
+            public void run() {
+                TzcPolicyOperationServiceImpl operationService = SpringUtils.getBean(TzcPolicyOperationServiceImpl.class);
+                RedisService redisService = SpringUtils.getBean(RedisService.class);
+                boolean createLock = redisService.tryToLock(operationService.getTemplateCode(),policyId+"");
+                if(createLock){
+                    try {
+                        log.debug("--------------------------SubmitPolicy CallbackTimer Sleep Start------------------------------");
+                        AuthContextUtils.setTenant("001");
+                        Thread.sleep(3*1000);
+                        String summeryResult = operationService.checkAffairSummery(policyId.toString());
+                        if(summeryResult.equals(TzcPolicyOperationServiceImpl.SummeryState_Success)){
+                            //调用成功回调方法
+                            TbsAffairCommitBo finishedParam = new TbsAffairCommitBo();
+                            finishedParam.setPolicyId(policyId);
+                            operationService.doFinished(finishedParam);
+                        }
+                        log.debug("--------------------------SubmitPolicy CallbackTimer summeryResult:{}------------------------------",summeryResult);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }finally {
+                        redisService.removeLock(operationService.getTemplateCode(),policyId+"");
+                    }
+                }
+
+            }
+        };
+    }
+
+    /**
+     * 异步保存费用申请状态
+     * @param budgetId
+     * @return
+     */
+    public static TimerTask submitBudgetChange(String budgetId) {
+        return new TimerTask() {
+            @Override
+            public void run() {
+                try {
+                    AuthContextUtils.setTenant("001");
+                    log.debug("--------------------------SubmitBudgetApply CallbackTimer Sleep Start :{}------------------------------",budgetId);
+                    Thread.sleep(3*1000);
+
+                    TbsBudgetChangeOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsBudgetChangeOperationServiceImpl.class);
+
+                    String summeryResult = applyOperationService.checkAffairSummery(budgetId);
+                    if(summeryResult.equals(TzcPolicyOperationServiceImpl.SummeryState_Success)){
+                        TbsAffairCommitBo doParam = new TbsAffairCommitBo();
+                        doParam.setTargetId(budgetId);
+                        applyOperationService.doFinished(doParam);
+                    }
+                    log.debug("--------------------------SubmitBudgetApply CallbackTimer summeryResult:{} ------------------------------",summeryResult);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        };
+    }
+
+    /**
+     * 异步保存费用申请状态
+     * @param batchId
+     * @return
+     */
+    public static TimerTask submitBudgetBatch(String batchId) {
+        return new TimerTask() {
+            @Override
+            public void run() {
+                try {
+                    AuthContextUtils.setTenant("001");
+                    log.debug("--------------------------SubmitBudgetApply CallbackTimer Sleep Start------------------------------");
+                    Thread.sleep(7*1000);
+                    TbsBudgetBatchOperationServiceImpl operationService = SpringUtils.getBean(TbsBudgetBatchOperationServiceImpl.class);
+
+                    String summeryResult = operationService.checkAffairSummery(batchId);
+                    if(summeryResult.equals(TzcPolicyOperationServiceImpl.SummeryState_Success)){
+                        TbsAffairCommitBo doParam = new TbsAffairCommitBo();
+                        doParam.setTargetId(batchId);
+                        operationService.doFinished(doParam);
+                    }
+                    log.debug("--------------------------SubmitBudgetApply CallbackTimer summeryResult:{} ------------------------------",summeryResult);
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        };
+    }
+
+    /**
+     * 异步保存费用申请状态
+     * @param budgetId
+     * @return
+     */
+    public static TimerTask submitBudgetApply(String budgetId) {
+        return new TimerTask() {
+            @Override
+            public void run() {
+                try {
+                    AuthContextUtils.setTenant("001");
+                    log.debug("--------------------------submitBudgetApply CallbackTimer Sleep Start :{}------------------------------",budgetId);
+                    Thread.sleep(3*1000);
+                    TbsBudgetApplyOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsBudgetApplyOperationServiceImpl.class);
+                    String summeryResult = applyOperationService.checkAffairSummery(budgetId);
+                    if(summeryResult.equals(TzcPolicyOperationServiceImpl.SummeryState_Success)){
+                        TbsAffairCommitBo doParam = new TbsAffairCommitBo();
+                        doParam.setTargetId(budgetId);
+                        applyOperationService.doFinished(doParam);
+                    }
+                    log.debug("--------------------------SubmitBudgetApply CallbackTimer summeryResult:{} ------------------------------",summeryResult);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        };
+    }
+
+    /**
+     * 异步保存费用申请状态
+     * @param costApply
+     * @return
+     */
+    public static TimerTask submitCostApply(TbsCostApply costApply) {
+        return new TimerTask() {
+            @Override
+            public void run() {
+                try {
+                    AuthContextUtils.setTenant("001");
+                    log.debug("--------------------------SubmitCostApply CallbackTimer Sleep Start------------------------------");
+                    Thread.sleep(7*1000);
+                    TbsCostApplyOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsCostApplyOperationServiceImpl.class);
+                    String summeryResult = applyOperationService.checkAffairSummery(costApply.getId().toString());
+                    if(summeryResult.equals(TbsCostApplyOperationServiceImpl.SummeryState_Success)){
+                        //调用成功回调方法
+                        TbsAffairCommitBo finishedParam = new TbsAffairCommitBo();
+                        finishedParam.setCostApplyId(costApply.getId());
+                        applyOperationService.doFinished(finishedParam);
+                    }
+                    log.debug("--------------------------SubmitCostApply CallbackTimer summeryResult:{} ------------------------------",summeryResult);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        };
+    }
+
+
+    /**
+     * 异步保存核销状态
+     * @param verificationId
+     * @param totalAmount
+     * @return
+     */
+    public static TimerTask saveVtbSubmit(String userCode,Long verificationId, BigDecimal totalAmount,boolean realaseFlag) {
+        log.warn("费用释放---verificationId:{} totalAmount:{}  realaseFlag:{}",verificationId,totalAmount,realaseFlag);
+        return new TimerTask() {
+            @Override
+            public void run() {
+                try {
+                    AuthContextUtils.setTenant("001");
+                    Thread.sleep(3*1000);
+                    VtbVerificationService vtbVerificationService = SpringUtils.getBean(VtbVerificationService.class);
+                    VtbVerification verification = vtbVerificationService.getById(verificationId);
+                    if(!verification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){
+                        return;
+                    }
+                    VtbVerificationOperationServiceImpl verificationOperationService = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class);
+                    String summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString());
+
+                    if(summeryResult.equals(TbsCostApplyOperationServiceImpl.SummeryState_Success)){
+                        verificationOperationService.runCompensate(verificationId+"");
+                    }
+
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        };
+    }
+
 }

src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java

@@ -1,14 +1,18 @@
 package com.qs.serve.common.framework.mvc;
 
+import com.qs.serve.common.config.DevEnvironmentConfig;
+import com.qs.serve.common.framework.redis.RedisService;
 import com.qs.serve.common.framework.security.model.LoginUser;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.DateUtils;
 import com.qs.serve.common.util.ServletUtils;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.Resource;
 import javax.servlet.*;
 import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.HttpServletRequest;
@@ -18,6 +22,8 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 /**
  * HttpServletRequest 过滤器
@@ -33,6 +39,8 @@ import java.nio.charset.StandardCharsets;
 @Order(10000)
 public class HttpServletRequestFilter implements Filter{
 
+    @Resource
+    RedisService redisService;
 
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
@@ -59,31 +67,49 @@ public class HttpServletRequestFilter implements Filter{
         double diffTime = DateUtils.diffTime(startTime,endTime);
         assert servletRequest instanceof HttpServletRequest;
         HttpServletRequest request = (HttpServletRequest)servletRequest;
-        String tenant = request.getHeader("tenant-id");
+        String supplierId = request.getHeader("supplierId");
         String url = request.getRequestURL().toString();
         String method = request.getMethod();
         String queryStr = request.getQueryString();
         String reqBody = "";
-        if (ServletUtils.isJsonRequest(request)) {
+        if (ServletUtils.isJsonRequest(request)&&requestWrapper!=null) {
             reqBody = requestWrapper.getBody();
         }
-        StringBuffer buffer = new StringBuffer("["+method+"] "+url + "  IP: "+ServletUtils.getIp(request));
+        StringBuffer buffer = new StringBuffer("\n["+method+"] "+url);
-        buffer.append("\n校区编号: "+tenant);
+        if(supplierId!=null){
-        try {
+            buffer.append(" 供应商ID: "+supplierId);
-            LoginUser loginUser = AuthContextUtils.getLoginUser(false);
-            if(loginUser!=null){
-                buffer.append("\n用户类型: "+ loginUser.getTypeFlag().getName()+"  用户ID: "+loginUser.getUserId());
         }
-        } catch (Exception e) {}
         if(!StringUtils.isEmpty(queryStr)){
             buffer.append("\n参数: "+queryStr);
         }
-        if(!StringUtils.isEmpty(reqBody)){
+        if(DevEnvironmentConfig.isDev() &&!StringUtils.isEmpty(reqBody)){
             buffer.append("\n请求体: "+reqBody);
         }
+        if(diffTime>0.6D){
             buffer.append("\n耗时: "+diffTime+"秒");
-        /*if(diffTime>4){ log.warn("访问速度：{}秒,接口：{},参数：{},请求体：{}",diffTime,"["+method+"] "+url,queryStr,reqBody);}*/
+        }
-        System.out.println(buffer);
+        try {
+            LoginUser loginUser = AuthContextUtils.getLoginUser(false);
+            if(loginUser!=null){
+                buffer.append("\n用户: "+loginUser.getNick());
+                buffer.append("  IP:["+ServletUtils.getIp(request)+"]");
+                buffer.append("  时间:["+ LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)+"]");
+            }
+        } catch (Exception e) {}
+        if(diffTime< 1D){
+            log.info(buffer.toString());
+        }else if (diffTime< 20D){
+            log.warn(buffer.toString());
+        }else {
+            log.error(buffer.toString());
+        }
+        String themeKey = AuthContextUtils.getLockTheme();
+        if(StringUtils.hasText(themeKey)){
+            log.warn("释放资源key：{}",themeKey);
+            redisService.remove(themeKey);
+        }
+        //释放资源 防止线程池重复利用出现脏数据
+        AuthContextUtils.removeThreadLocal();
     }
 
     @Override

src/main/java/com/qs/serve/common/framework/mybatis/handler/meta/TableNameAppendHandler.java

@@ -0,0 +1,69 @@
+package com.qs.serve.common.framework.mybatis.handler.meta;
+
+import com.baomidou.mybatisplus.extension.plugins.handler.TableNameHandler;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 拓展表格名称
+ * @author YenHex
+ * @since 2024/12/26
+ */
+@Slf4j
+public class TableNameAppendHandler implements TableNameHandler {
+
+    /**
+     * 用于记录哪些表可以使用该月份动态表名处理器（即哪些表按月分表）
+     */
+    private List<String> tableNames;
+
+    /**
+     * 构造函数，构造动态表名处理器的时候，传递tableNames参数
+     * @param tableNames
+     */
+    public TableNameAppendHandler(String ...tableNames) {
+        this.tableNames = Arrays.asList(tableNames);
+    }
+
+    /**
+     * 每个请求线程维护一个month数据，避免多线程数据冲突。所以使用ThreadLocal
+     */
+    private static final ThreadLocal<String> APPEND_DATA = new ThreadLocal<>();
+
+    /**
+     * 设置请求线程的month数据
+     * @param name
+     */
+    public static void setAppend(String name) {
+        APPEND_DATA.set(name);
+    }
+
+    /**
+     * 删除当前请求线程的month数据
+     */
+    public static void removeCache() {
+        APPEND_DATA.remove();
+    }
+
+    /**
+     * 动态表名接口实现方法
+     * @param sql
+     * @param tableName
+     * @return
+     */
+    @Override
+    public String dynamicTableName(String sql, String tableName) {
+        if (this.tableNames.contains(tableName) && APPEND_DATA.get() != null){
+            //表名增加月份后缀
+            return tableName + "_" + APPEND_DATA.get();
+        }else{
+            if(this.tableNames.contains(tableName)){
+                log.warn("APPEND_DATA is null, table is {}",tableName);
+            }
+            //表名原样返回
+            return tableName;
+        }
+    }
+}

src/main/java/com/qs/serve/common/framework/redis/RedisService.java

@@ -1,7 +1,15 @@
 package com.qs.serve.common.framework.redis;
 
+import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.util.AuthContextUtils;
 import lombok.AllArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.cache.RedisCacheWriter;
 import org.springframework.data.redis.core.*;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.stereotype.Service;
 import java.io.Serializable;
 import java.util.*;
@@ -15,10 +23,62 @@ import java.util.concurrent.TimeUnit;
 @AllArgsConstructor
 public class RedisService {
 
+    @Bean
+    @Primary
+    public RedisCacheManager selfCacheManager(RedisTemplate<String, Object> redisTemplate) {
+        RedisCacheWriter redisCacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(redisTemplate.getConnectionFactory());
+        RedisCacheConfiguration redisCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig()
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisTemplate.getValueSerializer()));
+        return new TtlRedisCacheManager(redisCacheWriter, redisCacheConfiguration);
+    }
+
     private RedisTemplate redisTemplate;
 
     private StringRedisTemplate stringRedisTemplate;
 
+    public long nextId(String key) {
+        ValueOperations<String, String> valueOps = redisTemplate.opsForValue();
+        // 如果键不存在，则设置初始值为 "0"
+        if (!redisTemplate.hasKey(key)) {
+            valueOps.set(key, "0");
+        }
+        // 使用 INCR 命令递增计数器
+        return valueOps.increment(key);
+    }
+
+    /**
+     * 加锁
+     * @param theme
+     * @param id
+     * @return 是否在锁
+     */
+    public void throwResLock(String theme,String id){
+        String key = "LOCK_RES:"+theme+":"+id;
+        String value = this.getString(key);
+        System.out.println("throwResLock:"+value);
+        String newVal = "lock";
+        if(newVal.equals(value)){
+            Assert.throwEx("服务正在处理，请稍后再试");
+        }
+        this.set(key,newVal,10,TimeUnit.MINUTES);
+        String value2 = this.getString(key);
+        if(!newVal.equals(value2)){
+            Assert.throwEx("锁失效");
+        }
+        AuthContextUtils.setLockTheme(key);
+    }
+
+    /**
+     * 释放锁
+     * @param theme
+     * @param id
+     * @return 是否在锁
+     */
+    public void removeResLock(String theme,String id){
+        String key = "LOCK_RES:"+theme+":"+id;
+        this.remove(key);
+    }
+
 
     /**
      * 写入缓存
@@ -212,6 +272,14 @@ public class RedisService {
         return null;
     }
 
+    public Long getLong(final String key) {
+        String result = getString(key);
+        if(result!=null){
+            return Long.parseLong(result);
+        }
+        return null;
+    }
+
     /**
      * 哈希 添加
      *
@@ -306,4 +374,32 @@ public class RedisService {
         ZSetOperations<String, Object> zset = redisTemplate.opsForZSet();
         return zset.rangeByScore(key, scoure, scoure1);
     }
+
+    /**
+     * 移除业务锁
+     * @param code
+     * @param targetId
+     */
+    public void removeLock(String code,String targetId){
+        String key = "lock_commit:"+code+":"+targetId;
+        this.remove(key);
+    }
+
+    /**
+     * 锁
+     * @param code
+     * @param targetId
+     * @return true--新建锁成功，false反之
+     */
+    public boolean tryToLock(String code,String targetId){
+        String key = "lock_commit:"+code+":"+targetId;
+        Integer existState = getInteger(key);
+        if(existState==null){
+            this.set(key,1,20,TimeUnit.SECONDS);
+            return true;
+        }else {
+            return false;
+        }
+    }
+
 }

src/main/java/com/qs/serve/common/framework/redis/TtlRedisCacheManager.java

@@ -0,0 +1,30 @@
+package com.qs.serve.common.framework.redis;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.cache.RedisCache;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.cache.RedisCacheWriter;
+import org.springframework.util.StringUtils;
+
+import java.time.Duration;
+
+@Slf4j
+public class TtlRedisCacheManager extends RedisCacheManager {
+    public TtlRedisCacheManager(RedisCacheWriter cacheWriter, RedisCacheConfiguration defaultCacheConfiguration) {
+        super(cacheWriter, defaultCacheConfiguration);
+    }
+
+    @Override
+    protected RedisCache createRedisCache(String name, RedisCacheConfiguration cacheConfig) {
+        log.debug("TtlRedisCacheManager keyName:{}",name);
+        String[] cells = StringUtils.delimitedListToStringArray(name, "=");
+        name = cells[0];
+        if (cells.length > 1) {
+            long ttl = Long.parseLong(cells[1]);
+            // 根据传参设置缓存失效时间，默认单位是秒
+            cacheConfig = cacheConfig.entryTtl(Duration.ofSeconds(ttl));
+        }
+        return super.createRedisCache(name, cacheConfig);
+    }
+}

src/main/java/com/qs/serve/common/framework/security/filter/SecurityRequestFilter.java

@@ -1,12 +1,17 @@
 package com.qs.serve.common.framework.security.filter;
 
 import com.qs.serve.common.config.DevEnvironmentConfig;
+import com.qs.serve.common.config.properties.AuthUrlConst;
 import com.qs.serve.common.config.properties.PermitProperties;
+import com.qs.serve.common.config.properties.ProjectProperties;
 import com.qs.serve.common.framework.redis.RedisService;
+import com.qs.serve.common.framework.security.model.LoginUser;
+import com.qs.serve.common.framework.security.model.LoginUserDTO;
 import com.qs.serve.common.framework.security.model.LoginUserType;
 import com.qs.serve.common.model.HttpResponsePrintUtil;
 import com.qs.serve.common.model.consts.GySysConst;
 import com.qs.serve.common.model.consts.RedisCacheKeys;
+import com.qs.serve.common.util.JsonUtil;
 import com.qs.serve.common.util.JwtUtils;
 import com.qs.serve.common.framework.security.util.SecurityPermitUtil;
 import com.qs.serve.common.util.AuthContextUtils;
@@ -27,6 +32,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Objects;
 
 /**
  * 判断token情况
@@ -50,8 +56,14 @@ public class SecurityRequestFilter extends OncePerRequestFilter {
     @Autowired
     private RedisService redisService;
 
+    @Autowired
+    private ProjectProperties projectProperties;
+
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws ServletException, IOException {
+
+        String supplierId = request.getHeader(GySysConst.SUPPLIER_PROP);
+        AuthContextUtils.setSupplierId(supplierId);
         //移除前缀
         String url = request.getRequestURI();
         if(!StringUtils.isEmpty(contextPath)&&!contextPath.equals("/")){
@@ -74,6 +86,7 @@ public class SecurityRequestFilter extends OncePerRequestFilter {
             }
         }
         response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Expose-Headers", "Date");
         //登录拦截
         if ("OPTIONS".equals(request.getMethod())) {
             HttpResponsePrintUtil.print(response,200,"success");
@@ -85,12 +98,20 @@ public class SecurityRequestFilter extends OncePerRequestFilter {
                 return;
             }
         }
+        if(projectProperties.getCloseAuth()!=null && projectProperties.getCloseAuth().equals("true")){
+            for (String allowUrl : AuthUrlConst.AUTH_ALLOW_URL) {
+                if(url.contains(allowUrl)){
+                    doSecurityAuthor(false,request, response, chain);
+                }
+            }
+        }else {
             if(ignorePermit){
                 //try to doSecurityAuthor
                 tryDoSecurityAuthor(request, response, chain);
                 chain.doFilter(request,response);
             }else {
-            doSecurityAuthor(request, response, chain);
+                doSecurityAuthor(true,request, response, chain);
+            }
         }
     }
 
@@ -103,19 +124,17 @@ public class SecurityRequestFilter extends OncePerRequestFilter {
      * @throws ServletException
      */
     private void tryDoSecurityAuthor(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
+
         String tenant = request.getHeader(GySysConst.TENANT_PROP);
+        if(!StringUtils.hasText(tenant)){
+            tenant = "001";
+        }
         String token = request.getHeader(GySysConst.AUTHORIZATION_PROP);
-        if(tenant!=null&&token!=null&&JwtUtils.verify(token)){
+        if(token != null && JwtUtils.verify(token)){
             String userId = JwtUtils.getUserId(token);
-            String userType = JwtUtils.getUserType(token);
             AuthContextUtils.setTenant(tenant);
             if(SecurityContextHolder.getContext().getAuthentication()==null){
-                UserDetails userDetails = null;
+                UserDetails userDetails = sysUserService.getLoginUserById(userId);
-                if(userType.equals(LoginUserType.SYS_USER.getCode())
-                        ||userType.equals(LoginUserType.SYS_SUP_USER.getCode())){
-                    //后台管理员登录
-                    userDetails = sysUserService.getLoginUserById(userId);
-                }
                 if(userDetails!=null){
                     UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
                     authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
@@ -134,7 +153,7 @@ public class SecurityRequestFilter extends OncePerRequestFilter {
      * @throws IOException
      * @throws ServletException
      */
-    private void doSecurityAuthor(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
+    private void doSecurityAuthor(boolean checkRedis,HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
         String token = request.getHeader(GySysConst.AUTHORIZATION_PROP);
         if(!JwtUtils.verify(token)){
             HttpResponsePrintUtil.print2(response,401,"身份凭证无效或过期");
@@ -142,21 +161,18 @@ public class SecurityRequestFilter extends OncePerRequestFilter {
             String userId = JwtUtils.getUserId(token);
             String userType = JwtUtils.getUserType(token);
             String client = JwtUtils.getClient(token);
+            if(checkRedis){
                 String redisKey = com.qs.serve.common.util.StringUtils.format(RedisCacheKeys.LOGIN_KEY_APP,client,userId);
                 String cacheToken = redisService.getString(redisKey);
-            if(!DevEnvironmentConfig.isDev()&&!token.equals(cacheToken)){
+                if(cacheToken==null){
-                redisService.remove(redisKey);
+                    //redisService.remove(redisKey);
-                HttpResponsePrintUtil.print2(response,401,"异地登录，已被系统登出");
+                    HttpResponsePrintUtil.print2(response,401,"已被系统登出");
                     //return解决：security.access.AccessDeniedException
                     return;
                 }
-            if(SecurityContextHolder.getContext().getAuthentication()==null){
-                UserDetails userDetails = null;
-                if(userType.equals(LoginUserType.SYS_USER.getCode())
-                        ||userType.equals(LoginUserType.SYS_SUP_USER.getCode())){
-                    //后台管理员登录
-                    userDetails = sysUserService.getLoginUserById(userId);
             }
+            if(SecurityContextHolder.getContext().getAuthentication()==null){
+                UserDetails userDetails = sysUserService.getLoginUserById(userId);
                 if(userDetails==null){
                     HttpResponsePrintUtil.print2(response,401,"登录信息无效，请重新登录");
                     //return解决：security.access.AccessDeniedException
@@ -184,7 +200,8 @@ public class SecurityRequestFilter extends OncePerRequestFilter {
             AuthContextUtils.setTenant(tenant);
             return true;
         }else{
-            HttpResponsePrintUtil.print2(response,4001,"校区信息错误");
+            log.error("商户信息错误，请求地址：{}",request.getRequestURI());
+            HttpResponsePrintUtil.print2(response,4001,"商户信息错误");
             return false;
         }
     }

src/main/java/com/qs/serve/common/model/AmountDTO.java

@@ -0,0 +1,18 @@
+package com.qs.serve.common.model;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author YenHex
+ * @since 2023/7/31
+ */
+@Data
+public class AmountDTO {
+
+    private String id;
+
+    private BigDecimal amount;
+
+}

src/main/java/com/qs/serve/common/model/annotation/BusinessDifference.java

@@ -0,0 +1,20 @@
+package com.qs.serve.common.model.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * @author YenHex
+ * @since 2023/4/25
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface BusinessDifference {
+
+    /**
+     * 字段备注
+     * @return
+     */
+    String value() default "";
+
+}

src/main/java/com/qs/serve/common/model/chart/BiCommonCounter.java

@@ -0,0 +1,19 @@
+package com.qs.serve.common.model.chart;
+
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2023/6/7
+ */
+@Data
+public class BiCommonCounter {
+
+    /**
+     * 横轴下标的ID
+     */
+    private String label;
+
+    private Long counts;
+
+}

src/main/java/com/qs/serve/common/model/chart/BiMonthCounter.java

@@ -0,0 +1,15 @@
+package com.qs.serve.common.model.chart;
+
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2023/6/7
+ */
+@Data
+public class BiMonthCounter {
+
+    private String months;
+    private Long counts;
+
+}

src/main/java/com/qs/serve/common/model/chart/ChartAxisColumn.java

@@ -0,0 +1,39 @@
+package com.qs.serve.common.model.chart;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author YenHex
+ * @since 2023/6/7
+ */
+@Data
+public class ChartAxisColumn {
+
+    /** 列Id */
+    String columnId;
+
+    /** 列名 */
+    String columnName;
+
+    /** 系列坐标值合计 */
+    Double total;
+
+    public static List<ChartAxisColumn> buildMonthsOfYear(){
+        List<ChartAxisColumn> axisColumnList = new ArrayList<>();
+        for (long i = 1; i < 13; i++) {
+            ChartAxisColumn axisColumn = new ChartAxisColumn();
+            if(i>9){
+                axisColumn.setColumnId(i+"");
+            }else {
+                axisColumn.setColumnId("0"+i);
+            }
+            axisColumn.setColumnName(i+"月");
+            axisColumnList.add(axisColumn);
+        }
+        return axisColumnList;
+    }
+
+}

src/main/java/com/qs/serve/common/model/chart/ChartDataVo.java

@@ -0,0 +1,148 @@
+package com.qs.serve.common.model.chart;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author YenHex
+ * @since 2023/6/7
+ */
+@Data
+public class ChartDataVo {
+
+    /**
+     * 列（饼状图的主要参数）
+     */
+    List<ChartAxisColumn> axisColumnList;
+
+    /**
+     * 系列
+     */
+    List<ChartSeriesItem> seriesItemList;
+
+    /**
+     * 分组
+     */
+    List<ChartGroupItem> groupItemList;
+
+
+    public void initAxisColumnTotal(){
+        for (int i = 0; i < axisColumnList.size(); i++) {
+            ChartAxisColumn axisColumn = axisColumnList.get(i);
+            BigDecimal total = BigDecimal.ZERO;
+            if(seriesItemList!=null&&seriesItemList.size()>0){
+                for (ChartSeriesItem seriesItem : seriesItemList) {
+                    double value = seriesItem.getValues().get(i);
+                    total = total.add(new BigDecimal(value+""));
+                }
+            }
+            axisColumn.setTotal(total.doubleValue());
+        }
+    }
+
+    public static ChartDataVo buildStateChartData(List<BiCommonCounter> stateCounterList, Map<String,String> stateMap){
+        ChartDataVo chartDataVo = new ChartDataVo();
+        List<ChartAxisColumn> axisColumnList = new ArrayList<>();
+        List<ChartSeriesItem> seriesItemList = new ArrayList<>();
+        List<ChartGroupItem> groupItemList = new ArrayList<>();
+        ChartGroupItem groupItem = new ChartGroupItem();
+        groupItem.setGroupId(100L);
+        groupItem.setGroupName("默认");
+        groupItemList.add(groupItem);
+        for (String stateNum : stateMap.keySet()) {
+            String label = stateMap.get(stateNum);
+            ChartAxisColumn axisColumn = new ChartAxisColumn();
+            axisColumn.setColumnId(stateNum);
+            axisColumn.setColumnName(label);
+            axisColumnList.add(axisColumn);
+        }
+        List<Double> values = new ArrayList<>();
+        for (ChartAxisColumn chartAxisColumn : axisColumnList) {
+            Double currVal = 0.0;
+            for (BiCommonCounter counter : stateCounterList) {
+                if(chartAxisColumn.getColumnId().equals(counter.getLabel())){
+                    currVal = counter.getCounts().doubleValue();
+                    break;
+                }
+            }
+            values.add(currVal);
+        }
+        ChartSeriesItem seriesItem = new ChartSeriesItem();
+        seriesItem.setGroupId(groupItem.getGroupId());
+        seriesItem.setGroupName(groupItem.getGroupName());
+        seriesItem.setValues(values);
+        seriesItemList.add(seriesItem);
+        //更新total
+        chartDataVo.setAxisColumnList(axisColumnList);
+        chartDataVo.setGroupItemList(groupItemList);
+        chartDataVo.setSeriesItemList(seriesItemList);
+        chartDataVo.initAxisColumnTotal();
+        return chartDataVo;
+    }
+
+    public void tes(){
+
+    }
+
+    public void buildStateMap(Map<String,String> stateMap){
+        init();
+        for (String stateNum : stateMap.keySet()) {
+            String label = stateMap.get(stateNum);
+            ChartAxisColumn axisColumn = new ChartAxisColumn();
+            axisColumn.setColumnId(stateNum);
+            axisColumn.setColumnName(label);
+            this.axisColumnList.add(axisColumn);
+        }
+    }
+    public void buildStateMapOfMonths(){
+        init();
+        this.axisColumnList = ChartAxisColumn.buildMonthsOfYear();
+    }
+
+    /**
+     * 先调用buildStateMap
+     * @param groupId
+     * @param groupName
+     * @param stateCounterList
+     */
+    public void addData(Long groupId,String groupName,List<BiCommonCounter> stateCounterList){
+        ChartGroupItem groupItem = new ChartGroupItem();
+        groupItem.setGroupId(groupId);
+        groupItem.setGroupName(groupName);
+        groupItemList.add(groupItem);
+        List<Double> values = new ArrayList<>();
+        for (ChartAxisColumn chartAxisColumn : axisColumnList) {
+            Double currVal = 0.0;
+            for (BiCommonCounter counter : stateCounterList) {
+                if(chartAxisColumn.getColumnId().equals(counter.getLabel())){
+                    currVal = counter.getCounts().doubleValue();
+                    break;
+                }
+            }
+            values.add(currVal);
+        }
+        ChartSeriesItem seriesItem = new ChartSeriesItem();
+        seriesItem.setGroupId(groupItem.getGroupId());
+        seriesItem.setGroupName(groupItem.getGroupName());
+        seriesItem.setValues(values);
+        seriesItemList.add(seriesItem);
+        this.initAxisColumnTotal();
+    }
+
+    private void init(){
+        if(axisColumnList==null){
+            axisColumnList = new ArrayList<>();
+        }
+        if(seriesItemList==null){
+            seriesItemList = new ArrayList<>();
+        }
+        if(groupItemList==null){
+            groupItemList = new ArrayList<>();
+        }
+    }
+
+}

src/main/java/com/qs/serve/common/model/chart/ChartGroupItem.java

@@ -0,0 +1,18 @@
+package com.qs.serve.common.model.chart;
+
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2023/6/7
+ */
+@Data
+public class ChartGroupItem {
+
+    /** 组id */
+    private Long groupId;
+
+    /** 组名 */
+    private String groupName;
+
+}

src/main/java/com/qs/serve/common/model/chart/ChartSeriesItem.java

@@ -0,0 +1,26 @@
+package com.qs.serve.common.model.chart;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author YenHex
+ * @since 2023/6/7
+ */
+@Data
+public class ChartSeriesItem {
+
+
+    /** 组id */
+    Long groupId;
+
+    /** 组名 */
+    String groupName;
+
+    /**
+     * 值列表(列对应axisColumns)
+     */
+    List<Double> values;
+
+}

src/main/java/com/qs/serve/common/model/chart/PrintChart.java

@@ -0,0 +1,75 @@
+package com.qs.serve.common.model.chart;
+
+import com.qs.serve.common.util.JsonUtil;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * @author YenHex
+ * @since 2023/2/17
+ */
+public class PrintChart {
+
+
+    public static void main(String[] args) {
+
+        //eg. 统计最近5年入学人数，并区分男女数量
+        ChartDataVo chartDataVo = new ChartDataVo();
+
+        List<ChartAxisColumn> axisColumnList = new ArrayList<>();
+        List<ChartSeriesItem> seriesItemList = new ArrayList<>();
+        List<ChartGroupItem> groupItemList = new ArrayList<>();
+
+        ChartGroupItem groupItem = new ChartGroupItem();
+        groupItem.setGroupId(100L);
+        groupItem.setGroupName("男学生");
+        groupItemList.add(groupItem);
+
+        ChartGroupItem groupItem2 = new ChartGroupItem();
+        groupItem2.setGroupId(200L);
+        groupItem2.setGroupName("女学生");
+        groupItemList.add(groupItem2);
+
+        for (long i = 1; i <= 5; i++) {
+            ChartAxisColumn axisColumn = new ChartAxisColumn();
+            axisColumn.setColumnId(i+"");
+            axisColumn.setColumnName("202"+i+"年");
+            axisColumnList.add(axisColumn);
+        }
+
+        Random random = new Random();
+        for (ChartGroupItem chartGroupItem : groupItemList) {
+            ChartSeriesItem seriesItem = new ChartSeriesItem();
+            seriesItem.setGroupId(chartGroupItem.getGroupId());
+            seriesItem.setGroupName(chartGroupItem.getGroupName());
+            List<Double> values = new ArrayList<>();
+            for (int i = 0; i < axisColumnList.size(); i++) {
+                double result = random.nextInt(1000)+3000;
+                values.add(result);
+            }
+            seriesItem.setValues(values);
+            seriesItemList.add(seriesItem);
+        }
+        //更新total
+        for (int i = 0; i < axisColumnList.size(); i++) {
+            ChartAxisColumn axisColumn = axisColumnList.get(i);
+            BigDecimal total = BigDecimal.ZERO;
+            for (ChartSeriesItem seriesItem : seriesItemList) {
+                double value = seriesItem.getValues().get(i);
+                total = total.add(new BigDecimal(value+""));
+            }
+            axisColumn.setTotal(total.doubleValue());
+        }
+        chartDataVo.setAxisColumnList(axisColumnList);
+        chartDataVo.setGroupItemList(groupItemList);
+        chartDataVo.setSeriesItemList(seriesItemList);
+        String v = JsonUtil.objectToJson(chartDataVo);
+        System.out.println(v);
+    }
+
+
+
+}

src/main/java/com/qs/serve/common/model/consts/ApplyTypeConst.java

@@ -0,0 +1,13 @@
+package com.qs.serve.common.model.consts;
+
+/**
+ * @author YenHex
+ * @since 2023/9/19
+ */
+public interface ApplyTypeConst {
+
+    String CostBill = "CostBill";
+    String CheckCost = "CheckCost";
+    String ReleasePolicy = "ReleasePolicy";
+
+}

src/main/java/com/qs/serve/common/model/consts/BudgetLogRollbackFlag.java

@@ -0,0 +1,21 @@
+package com.qs.serve.common.model.consts;
+
+/**
+ * @author YenHex
+ * @since 2023/1/30
+ */
+public interface BudgetLogRollbackFlag {
+
+    /** 正常(标记为最新记录) */
+    Integer State_0 = 0;
+
+    /** 回退 */
+    Integer State_1 = 1;
+
+    /** 回退已处理 */
+    Integer State_2 = 2;
+
+    /** 删除已处理 */
+    Integer State_3 = 3;
+
+}

src/main/java/com/qs/serve/common/model/consts/DSName.java

@@ -0,0 +1,11 @@
+package com.qs.serve.common.model.consts;
+
+/**
+ * @author YenHex
+ * @since 2024/3/20
+ */
+public interface DSName {
+
+    String QiSheng = "qisheng";
+
+}

src/main/java/com/qs/serve/common/model/consts/GySysConst.java

@@ -17,6 +17,7 @@ public class GySysConst {
     public static final String USER_AGENT_PROP = "User-Agent";
 
     public static final String TENANT_PROP = "tenant-id";
+    public static final String SUPPLIER_PROP = "supplierId";
 
     /** 系统租户数据库列 */
     public static final String TENANT_COLUMN = "tenant_id";

src/main/java/com/qs/serve/common/model/consts/RedisCacheKeys.java

@@ -6,25 +6,28 @@ package com.qs.serve.common.model.consts;
  */
 public class RedisCacheKeys {
 
-    /** 权限列表 */
+    public final static String SUPPLIER_RELATE_TREE = "supplier_relate_tree";
-    public final static String PERMIT_ALL_LIST = "expire_permit_list";
 
     /** 租户列表 */
     public final static String Tenant_ALL_LIST = "expire_tenant_list";
 
-    /** 管理员登录key */
-    public final static String LOGIN_KEY_ADMIN = "login_admin_:";
 
-    /** 家长登录key */
-    public final static String LOGIN_KEY_WX = "login_wx_:";
 
     /** 用户登录APP {}客户端 {}用户ID */
     public final static String LOGIN_KEY_APP = "login_app_{}:{}:";
 
+    /** 微信用户ID */
+    public final static String WX_KEY_USER = "wx_usr_id:{}:";
+
     /** 手机号验证吗 */
     public final static String PHONE_KEY = "phone_code_:";
 
-    /** 工号标识 */
+    /**
-    public final static String SYS_USER_CODE_KEY = "sys_user_code_:";
+     * 0-无需操作
+     * 1-未处理
+     * 2-同步中
+     * 3-同步完成，但未更新表
+     */
+    public final static String HIS_UPDATE = "update_his_flag:";
 
 }

src/main/java/com/qs/serve/common/model/consts/ResultFlag.java

@@ -0,0 +1,12 @@
+package com.qs.serve.common.model.consts;
+
+/**
+ * @author YenHex
+ * @since 2023/2/15
+ */
+public interface ResultFlag {
+
+    int OK = 1;
+    int NOT = 0;
+
+}

src/main/java/com/qs/serve/common/model/consts/SysConfigKey.java

@@ -0,0 +1,19 @@
+package com.qs.serve.common.model.consts;
+
+/**
+ * 系统配置
+ * @author YenHex
+ * @since 2022/11/12
+ */
+public interface SysConfigKey {
+
+    /** 费用超支 */
+    String TbsBudgetOverspend = "TbsBudgetOverspend";
+
+    /** 活动预计核销日期 */
+    String ActivityPreCheckDays = "ActivityPreCheckDays";
+
+    String DateCheckApplyExcelYear = "DateCheckApplyExcelYear";
+
+    String PolicyDelayDays = "PolicyDelayDays";
+}

src/main/java/com/qs/serve/common/model/dto/CommonIdsParam.java

@@ -0,0 +1,16 @@
+package com.qs.serve.common.model.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author YenHex
+ * @since 2024/6/11
+ */
+@Data
+public class CommonIdsParam {
+
+    private List<String> ids;
+
+}

src/main/java/com/qs/serve/common/model/dto/DateSplitDTO.java

@@ -0,0 +1,29 @@
+package com.qs.serve.common.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * @author YenHex
+ * @since 2023/6/5
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class DateSplitDTO {
+
+    Integer days;
+
+    LocalDate startDate;
+
+    LocalDate endDate;
+
+    Integer yearMonth;
+
+    Integer sort;
+
+}

src/main/java/com/qs/serve/common/model/dto/DiffFieldVal.java

@@ -0,0 +1,17 @@
+package com.qs.serve.common.model.dto;
+
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2023/4/25
+ */
+@Data
+public class DiffFieldVal {
+
+    String field;
+    String comment;
+    String orgValue;
+    String newValue;
+
+}

src/main/java/com/qs/serve/common/model/dto/HeaderOption.java

@@ -0,0 +1,27 @@
+package com.qs.serve.common.model.dto;
+
+import com.qs.serve.common.util.PageUtil;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author YenHex
+ * @since 2023/5/17
+ */
+@Data
+public class HeaderOption {
+
+    private String name;
+//    private String width;
+//    private String prefix;
+//    private String suffix;
+    private Boolean isSum;
+    private Integer decimalLength;
+    private String align;
+    private List<HeaderOption> children;
+
+    public HeaderOption(String name){
+        this.name = name;
+    }
+}

src/main/java/com/qs/serve/common/model/dto/PageVo.java

@@ -43,4 +43,14 @@ public class PageVo<T>{
         this.totalPage = total%pageSize==0?total/pageSize:(total/pageSize+1);
     }
 
+    public static <TYPE,R_TYPE> PageVo<R_TYPE> initNewList(PageVo<TYPE> oldVo,List<R_TYPE> list){
+        PageVo<R_TYPE> newVo = new PageVo<>();
+        newVo.setPageNum(oldVo.getPageNum());
+        newVo.setPageSize(oldVo.getPageSize());
+        newVo.setTotal(oldVo.getTotal());
+        newVo.setTotalPage(oldVo.getTotalPage());
+        newVo.setList(list);
+        return newVo;
+    }
+
 }

src/main/java/com/qs/serve/common/model/dto/R.java

@@ -48,6 +48,7 @@ public class R<T> implements Serializable {
     private T data;
 
     public static final int SUCCESS_STATUS = 200;
+    public static final int IMPORT_ERROR = 201;
     public static final int LOGOUT_STATUS = 401;
     public static final int FORBIDDEN_STATUS = 403;
     public static final int NOT_FOUND_STATUS = 434;
@@ -116,10 +117,22 @@ public class R<T> implements Serializable {
         return new R<>(FAILED_STATUS,message,null);
     }
 
+    public static R errorImport(Object data) {
+        return new R<>(IMPORT_ERROR,"导入异常",data);
+    }
+
+    public static <TYPE> R<TYPE> error(String message,TYPE data) {
+        return new R<>(FAILED_STATUS,FAILED_TIPS,data);
+    }
+
+
+
     public static R error() {
         return new R<>(FAILED_STATUS,FAILED_TIPS,null);
     }
-
+    public static R errorNotFound() {
+        return new R<>(FAILED_STATUS,NOT_FOUND_TIPS,null);
+    }
     public static R error2() {
         return new R<>(FAILED_STATUS,FAILED_TIPS_2,null);
     }
@@ -139,6 +152,10 @@ public class R<T> implements Serializable {
     }
 
     public static <TYPE> R<PageVo<TYPE>> byPageHelperList(List<TYPE> data){
+        return R.ok(buildPageHelperList(data));
+    }
+
+    public static <TYPE> PageVo<TYPE> buildPageHelperList(List<TYPE> data){
         PageVo<TYPE> pageVo = new PageVo<>();
         PageInfo<TYPE> pageInfo = new PageInfo<>(data);
         pageVo.setPageSize(pageInfo.getPageSize());
@@ -146,7 +163,18 @@ public class R<T> implements Serializable {
         pageVo.setTotal(pageInfo.getTotal());
         pageVo.setList(data);
         pageVo.setTotalPage(new Long(pageInfo.getPages()));
-        return R.ok(pageVo);
+        return pageVo;
+    }
+
+    public static <TYPE,R_TYPE> PageVo<R_TYPE> buildPageHelperList(List<TYPE> sources,List<R_TYPE> details){
+        PageVo<R_TYPE> pageVo = new PageVo<>();
+        PageInfo<TYPE> pageInfo = new PageInfo<>(sources);
+        pageVo.setPageSize(pageInfo.getPageSize());
+        pageVo.setPageNum(pageInfo.getPageNum());
+        pageVo.setTotal(pageInfo.getTotal());
+        pageVo.setList(details);
+        pageVo.setTotalPage(new Long(pageInfo.getPages()));
+        return pageVo;
     }
 
     public static <TYPE> R<PageVo<TYPE>> byEmptyList(){
@@ -170,4 +198,26 @@ public class R<T> implements Serializable {
         return R.ok(pageVo);
     }
 
+    public static <TYPE> R<PageVo<TYPE>> byPageList(Integer pageNum,Integer pageSize,Long total,List<TYPE> data){
+        PageVo<TYPE> pageVo = new PageVo<>();
+        pageVo.setPageSize(pageSize);
+        pageVo.setPageNum(pageNum);
+        pageVo.setTotal(total);
+        pageVo.setList(data);
+        pageVo.setTotalPage(total%pageSize==0?total/pageSize:total/pageSize+1);
+        return R.ok(pageVo);
+    }
+
+    public static <TYPE> R<PageVo<TYPE>> byPageList(Long total,List<TYPE> data){
+        Integer pageNum = PageUtil.getPageNum();
+        Integer pageSize = PageUtil.getPageSize();
+        PageVo<TYPE> pageVo = new PageVo<>();
+        pageVo.setPageSize(pageSize);
+        pageVo.setPageNum(pageNum);
+        pageVo.setTotal(total);
+        pageVo.setList(data);
+        pageVo.setTotalPage(total%pageSize==0?total/pageSize:total/pageSize+1);
+        return R.ok(pageVo);
+    }
+
 }

src/main/java/com/qs/serve/common/model/dto/RowParam.java

@@ -0,0 +1,26 @@
+package com.qs.serve.common.model.dto;
+
+import com.qs.serve.common.util.PageUtil;
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2023/5/17
+ */
+@Data
+public class RowParam {
+
+    private Integer startIndex;
+    private Integer size;
+
+    public RowParam(Integer startIndex, Integer size) {
+        this.startIndex = startIndex;
+        this.size = size;
+    }
+
+    public RowParam(boolean pageable) {
+        this.size = PageUtil.getPageSize();
+        this.startIndex =  (PageUtil.getPageNum()-1)*size;
+    }
+
+}

src/main/java/com/qs/serve/common/model/dto/SimpleCountValue.java

@@ -0,0 +1,16 @@
+package com.qs.serve.common.model.dto;
+
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2024/8/29
+ */
+@Data
+public class SimpleCountValue {
+
+    String id;
+
+    Long count;
+
+}

src/main/java/com/qs/serve/common/model/dto/SimpleKeyValue.java

@@ -2,13 +2,19 @@ package com.qs.serve.common.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author YenHex
  * @since 2022/3/7
  */
 @Data
-@AllArgsConstructor
+@NotNull
+@NoArgsConstructor
 public class SimpleKeyValue<T> {
 
     /** 键 */
@@ -17,7 +23,27 @@ public class SimpleKeyValue<T> {
     /** 值 */
     private T value;
 
+    private String value2;
+
+    private String parentId;
+
     /** 说明 */
     private String remark;
 
+    private List<SimpleKeyValue<T>> childList = new ArrayList<>();
+
+    public SimpleKeyValue(String label,T value,String remark){
+        this.label = label;
+        this.value = value;
+        this.remark = remark;
+    }
+    public SimpleKeyValue(String label,T value){
+        this.label = label;
+        this.value = value;
+    }
+
+    public void addChild(SimpleKeyValue<T> value){
+        childList.add(value);
+    }
+
 }

src/main/java/com/qs/serve/common/model/dto/TargetDTO.java

@@ -0,0 +1,29 @@
+package com.qs.serve.common.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2023/4/7
+ */
+@Data
+@AllArgsConstructor
+public class TargetDTO {
+    String targetId;
+    String targetCode;
+    String targetName;
+
+    public TargetDTO(String targetId, String targetCode, String targetName) {
+        this.targetId = targetId;
+        this.targetCode = targetCode;
+        this.targetName = targetName;
+    }
+
+    //拜访相关业务
+    String localX;
+    String localY;
+    String address;
+    String mapAddress;
+
+}

src/main/java/com/qs/serve/common/model/dto/TargetObjectDTO.java

@@ -0,0 +1,23 @@
+package com.qs.serve.common.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * @author YenHex
+ * @since 2023/4/7
+ */
+@Data
+public class TargetObjectDTO {
+
+    String targetType;
+    String targetId;
+
+    String targetCode;
+    String targetName;
+
+}

src/main/java/com/qs/serve/common/model/dto/TreeNode.java

@@ -14,7 +14,8 @@ import java.util.List;
 public class TreeNode {
     protected String id;
     protected String parentId;
-    private Integer sort;
+    protected Integer nodeLevel;
+    protected Integer sort;
     protected List<TreeNode> children = new ArrayList<>();
 
     public void addChildren(TreeNode treeNode) {
@@ -22,7 +23,7 @@ public class TreeNode {
     }
 
     public List<TreeNode> getChildren() {
-        if(children.size()<=0){
+        if(children==null||children.size()<=0){
             return null;
         }
         return children;

src/main/java/com/qs/serve/common/model/enums/BizType.java

@@ -43,6 +43,10 @@ public enum BizType {
 
     QUERY("查询"),
 
+    LEAVE("离职"),
+    EXPORT("导出"),
+    SUBMIT("提交"),
+
     RESET("重置");
 
     String value;

src/main/java/com/qs/serve/common/model/enums/BudgetLogOptFlag.java

@@ -0,0 +1,91 @@
+package com.qs.serve.common.model.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author YenHex
+ * @since 2023/1/30
+ */
+@Getter
+@AllArgsConstructor
+public enum BudgetLogOptFlag {
+
+    /** 0-预算新增 */
+    State_0(0,true),
+
+    /** 1-费用申请(费用申请，预算调减) */
+    State_1(1,false),
+
+    /** 2-预算调增 */
+    State_2(2,true),
+
+    /** 3-预算调减 */
+    State_3(3,false),
+
+    /** 4-费用释放(预算调增) */
+    State_4(4,true),
+
+    /** 5-费用申请调增(费用申请，预算调增) */
+    State_5(5,true),
+
+    /** 6-费用申请调减(费用申请，预算调减) */
+    State_6(6,false),
+
+    /** 已取消 7-销售区域迁移调增 */
+    State_7(7,false),
+
+    /** 已取消 8-销售区域迁移调减 */
+    State_8(8,false),
+
+    /** 已取消 9-行政区域迁移调增 */
+    State_9(9,false),
+
+    /** 已取消 10-行政区域迁移调减 */
+    State_10(10,false),
+
+    /** 11-政策申请 */
+    State_11(11,false),
+
+    /** 12-政策申请调增(政策申请，预算调增) */
+    State_12(12,true),
+
+    /** 13-政策因费用申请调增(政策申请，预算转移)  */
+    State_13(13,true),
+
+    /** 14-政策申请释放(被拒绝后,政策释放) */
+    State_14(14,true),
+
+    /** 15-费用申请释放(被拒绝后，预算增加) */
+    State_15(15,true),
+
+    /** 16-政策释放(释放操作，预算增加) */
+    State_16(16,true);
+
+    /**
+     * 编码
+     */
+    private Integer code;
+
+    /**
+     * 是否取反，添加预算
+     */
+    private boolean addBudget;
+
+    private final static List<Integer> finalBudgetOptFlag = Arrays.asList(0, 2, 3);
+
+    public final static List<Integer> finalCostOptFlag = Arrays.asList(1,4,5,6);
+
+    public final static List<Integer> finalPolicyOptFlag = Arrays.asList(11,12,13,14,15);
+
+    /**
+     * 预算规划，状态0，2，3，新增、调增、调减
+     */
+    public static List<Integer> getFinalBudgetOptFlag(){
+        return finalBudgetOptFlag;
+    }
+}

src/main/java/com/qs/serve/common/model/enums/HttpCode.java

@@ -21,7 +21,7 @@ public enum HttpCode {
     LOGIN_ERR(401,"登录信息已过期或失效"),
     LOGIN_ERR_2(500,"该账号已被停用，请联系系统管理员"),
     LOGIN_ERR_1(500,"账号或登录密码不正确"),
-    LOGIN_ERR_4001(4001,"校区信息错误"),
+    LOGIN_ERR_4001(4001,"商户信息错误"),
     LOGIN_ERR_4002(4002,"应用信息错误"),
 
 

src/main/java/com/qs/serve/common/model/enums/MonthValues.java

@@ -0,0 +1,40 @@
+package com.qs.serve.common.model.enums;
+
+/**
+ * @author YenHex
+ * @since 2023/9/13
+ */
+public class MonthValues {
+
+    public static final int[] Q1 = {1,2,3};
+    public static final int[] Q2 = {4,5,6};
+    public static final int[] Q3 = {7,8,9};
+    public static final int[] Q4 = {10,11,12};
+
+
+
+    public static int[] getQArr(Integer val){
+        for (int i = 0; i < Q1.length; i++) {
+            if(val==Q1[i]){
+                return Q1;
+            }
+        }
+        for (int i = 0; i < Q2.length; i++) {
+            if(val==Q2[i]){
+                return Q2;
+            }
+        }
+        for (int i = 0; i < Q3.length; i++) {
+            if(val==Q3[i]){
+                return Q3;
+            }
+        }
+        for (int i = 0; i < Q4.length; i++) {
+            if(val==Q4[i]){
+                return Q4;
+            }
+        }
+        return null;
+    }
+
+}

src/main/java/com/qs/serve/common/model/enums/SystemModule.java

@@ -12,8 +12,20 @@ import lombok.Getter;
 public enum SystemModule {
 
     QUESTION("qms","问卷"),
+    BAZ("baz","拜访"),
+    Policy("tzc","政策"),
+    Payment("pay","支付"),
+    Budget("budget","预算"),
+    Verification("verification","核算"),
+    BIZ("biz","业务"),
+    BASE("bms","基础档案"),
+    GOODS("goods","商品"),
     SYSTEM("sys","系统"),
-    UMS("ums","手机用户");
+    UMS("ums","手机用户"),
+    DATA("data","数据"),
+    Excel("excel","excel数据"),
+    Tag("tag","标签"),
+    SALE("sale","销售");
 
     String code;
 

src/main/java/com/qs/serve/common/model/oa/OaFormMainProcess.java

@@ -0,0 +1,42 @@
+package com.qs.serve.common.model.oa;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author YenHex
+ * @since 2024/1/12
+ */
+@Data
+public class OaFormMainProcess {
+
+    private String targetId;
+
+    /**
+     * 上次文件
+     */
+    private List<OaUploadFile> uploadFiles;
+
+    /**
+     * data
+     */
+    private Object data;
+
+    /**
+     * 员工号
+     */
+    private String senderLoginName;
+
+    /**
+     * 模板编码
+     */
+    private String templateCode;
+
+    private String userId;
+
+    /**
+     * 模板编码
+     */
+    private String tableName;
+}

src/main/java/com/qs/serve/common/model/oa/OaUploadFile.java

@@ -0,0 +1,27 @@
+package com.qs.serve.common.model.oa;
+
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2024/1/12
+ */
+@Data
+public class OaUploadFile {
+
+    /**
+     * 表单控件名称
+     */
+    private String field;
+
+    /**
+     * 附件文件名
+     */
+    private String name;
+
+    /**
+     * 附件url
+     */
+    private String url;
+
+}

src/main/java/com/qs/serve/common/model/tag/TagFiledUtil.java

@@ -0,0 +1,119 @@
+package com.qs.serve.common.model.tag;
+
+import cn.hutool.core.collection.CollUtil;
+import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.modules.goods.entity.GoodsSpu;
+import com.qs.serve.modules.his.entity.HisUserSupplier;
+import com.qs.serve.modules.tag.entity.so.TagQuery;
+import com.qs.serve.modules.tbs.entity.TbsCostApply;
+import com.qs.serve.modules.tbs.entity.so.VtbVerificationBatchQuery;
+import com.qs.serve.modules.vtb.entity.VtbVerification;
+import lombok.experimental.UtilityClass;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author YenHex
+ * @since 2024/7/15
+ */
+@UtilityClass
+public class TagFiledUtil {
+
+    public final static Map<String,String> TbsCostApplyPageMap = new HashMap<String,String>(){{
+        put("supplierId","tbs_cost_apply.supplier_id");
+    }};
+
+    public final static Map<String,String> VtbVerificationPageMap = new HashMap<String,String>(){{
+        put("supplierId","vtb_verification.supplier_id");
+    }};
+
+    public final static Map<String,String> VtbVerificationBatchPageMap = new HashMap<String,String>(){{
+        put("supplierId","vtb_verification_batch.supplier_id");
+    }};
+
+    public final static Map<String,String> BmsSupplierPageMap = new HashMap<String,String>(){{
+        put("id","bms_supplier.id");
+    }};
+
+    public final static Map<String,String> HisSupplierPageMap = new HashMap<String,String>(){{
+        put("id","his_user_supplier.supplier_id");
+    }};
+
+    public final static Map<String,String> goodsSpuPageMap = new HashMap<String,String>(){{
+        put("id","goods_spu.id");
+    }};
+
+    public static void TbsCostApplyPage(TbsCostApply param){
+        List<TagQuery> paramTagList = param.getTagQueryList();
+        List<TagQuery> newList = getNewList(paramTagList,TbsCostApplyPageMap);
+        param.setTagQueryList(newList);
+    }
+
+
+    public static void VtbVerificationPage(VtbVerification param){
+        List<TagQuery> paramTagList = param.getTagQueryList();
+        List<TagQuery> newList = getNewList(paramTagList,VtbVerificationPageMap);
+        param.setTagQueryList(newList);
+    }
+
+
+    public static void VtbVerificationBatchPage(VtbVerificationBatchQuery param){
+        List<TagQuery> paramTagList = param.getTagQueryList();
+        List<TagQuery> newList = getNewList(paramTagList,VtbVerificationBatchPageMap);
+        param.setTagQueryList(newList);
+    }
+
+    public static void BmsSupplierPage(BmsSupplier param){
+        List<TagQuery> paramTagList = param.getTagQueryList();
+        List<TagQuery> newList = getNewList(paramTagList,BmsSupplierPageMap);
+        param.setTagQueryList(newList);
+    }
+
+    public static void GoodsSpuPage(GoodsSpu param){
+        List<TagQuery> paramTagList = param.getTagQueryList();
+        List<TagQuery> newList = getNewList(paramTagList,goodsSpuPageMap);
+        param.setTagQueryList(newList);
+    }
+
+    public static void HisSupplierPage(HisUserSupplier param){
+        List<TagQuery> paramTagList = param.getTagQueryList();
+        List<TagQuery> newList = getNewList(paramTagList,HisSupplierPageMap);
+        param.setTagQueryList(newList);
+    }
+
+    /**
+     * 创建新的且有效性的查询参数(sql使用了非严谨写法，这里做了sql注入过滤)
+     * @param paramTagList
+     * @param columnMap
+     * @return
+     */
+    @NotNull
+    private static List<TagQuery> getNewList(List<TagQuery> paramTagList,Map<String,String> columnMap) {
+        List<TagQuery> newList = new ArrayList<>();
+        if(paramTagList!=null){
+            for (TagQuery tag : paramTagList) {
+                if(!StringUtils.hasText(tag.getTargetType())){
+                    continue;
+                }
+                if (StringUtils.hasText(tag.getTagName()) || CollUtil.isNotEmpty(tag.getTagIds())){
+                    String sqlColumn = columnMap.get(tag.getDataField());
+                    if(StringUtils.hasText(sqlColumn)){
+                        TagQuery newVal = new TagQuery();
+                        newVal.setTargetType(tag.getTargetType());
+                        newVal.setTagName(tag.getTagName());
+                        newVal.setTagIds(tag.getTagIds());
+                        newVal.setSqlColumn(sqlColumn);
+                        newList.add(newVal);
+                    }
+                }
+            }
+        }
+        return newList;
+    }
+
+}

src/main/java/com/qs/serve/common/util/AuthContextUtils.java

@@ -4,6 +4,10 @@ import com.qs.serve.common.framework.security.model.LoginUser;
 import com.qs.serve.common.framework.security.model.LoginUserType;
 import com.qs.serve.common.model.consts.GySysConst;
 import com.qs.serve.common.model.enums.HttpCode;
+import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.modules.bms.service.BmsSupplierService;
+import com.qs.serve.modules.wx.entity.WxUser;
+import com.qs.serve.modules.wx.service.WxUserService;
 import lombok.experimental.UtilityClass;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
@@ -21,6 +25,19 @@ import java.util.Objects;
 public class AuthContextUtils {
 
     private final static ThreadLocal<String> THREAD_TENANT = new ThreadLocal<>();
+    private final static ThreadLocal<Long> THREAD_SUPPLIER = new ThreadLocal<>();
+    private final static ThreadLocal<String> RES_THEME_LOCK = new ThreadLocal<>();
+
+    public static void removeThreadLocal(){
+        THREAD_TENANT.remove();
+        THREAD_SUPPLIER.remove();
+        RES_THEME_LOCK.remove();
+    }
+
+    /**
+     * 标注开发时使用
+     */
+    public static boolean DEV_INDEX = true;
 
     public static String getAppId(){
         return getAppId(true);
@@ -43,28 +60,29 @@ public class AuthContextUtils {
     }
 
     /**
-     * 获取微信用户ID
+     * 系统用户ID
      * @return
      */
-    public static String getWxUserId(){
+    public static String getSysUserId(){
         LoginUser loginUser = getLoginUser();
-        if(loginUser.getTypeFlag().equals(LoginUserType.APP_USER)){
         return loginUser.getUserId();
     }
-        return null;
-    }
 
     /**
      * 系统用户ID
      * @return
      */
-    public static String getSysUserId(){
+    public static String getSysUserId(Boolean throwEx){
-        LoginUser loginUser = getLoginUser();
+        if(throwEx){
-        if(loginUser.getTypeFlag().equals(LoginUserType.SYS_SUP_USER)
+            return getSysUserId();
-                ||loginUser.getTypeFlag().equals(LoginUserType.SYS_USER)){
+        }else {
+            LoginUser loginUser = getLoginUser(false);
+            if(loginUser==null){
+                return null;
+            }else {
                 return loginUser.getUserId();
             }
-        return null;
+        }
     }
 
     /**
@@ -80,6 +98,50 @@ public class AuthContextUtils {
 
     public static String getTenant(){return THREAD_TENANT.get();}
 
+
+    public static void setLockTheme(String value){RES_THEME_LOCK.set(value);}
+
+    public static String getLockTheme(){return RES_THEME_LOCK.get();}
+
+    public static void setSupplierId(String value){
+        if(StringUtils.hasText(value)){
+            try {
+                THREAD_SUPPLIER.set(Long.parseLong(value));
+            } catch (NumberFormatException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public static BmsSupplier getCurrentSupplier(){
+        String userId = AuthContextUtils.getSysUserId();
+        Long supplierId = AuthContextUtils.getSupplierId();
+        BmsSupplierService supplierService = SpringUtils.getBean(BmsSupplierService.class);
+        BmsSupplier supplier = supplierService.getById(supplierId);
+//        if(supplier==null){
+//            Assert.throwEx(4106,"供应商无效或未授权");
+//        }
+//        boolean isOther = false;
+//
+//        if(CollectionUtil.isNotEmpty(supplier.getOtherUserIds())){
+//            for (String otherUserId : supplier.getOtherUserIds()) {
+//                if(userId.equals(otherUserId)){
+//                    isOther = true;
+//                    break;
+//                }
+//            }
+//        }
+//        if(isOther && !supplier.getUserId().equals(userId)){
+//            Assert.throwEx(4106,"供应商无效或未授权");
+//        }
+//        if(supplier.getStopFlag().equals(1)){
+//            Assert.throwEx(4106,"供应商已停用");
+//        }
+        return supplier;
+    }
+
+    public static Long getSupplierId(){return THREAD_SUPPLIER.get();}
+
     public static void removeTenant(){THREAD_TENANT.remove();}
 
     public static LoginUser getLoginUser(boolean throwEx){

src/main/java/com/qs/serve/common/util/BirHttpUtil.java

@@ -0,0 +1,156 @@
+package com.qs.serve.common.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.qs.serve.common.config.properties.ProjectProperties;
+import com.qs.serve.common.model.consts.GySysConst;
+import com.qs.serve.common.model.dto.R;
+import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem;
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.ParseException;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.util.EntityUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author YenHex
+ * @since 2022/11/23
+ */
+@Slf4j
+@UtilityClass
+public class BirHttpUtil {
+
+    /**
+     * 判断当前环境是否请求bir
+     * @return
+     */
+    public static boolean isRestBir(){
+        ProjectProperties projectProperties = SpringUtils.getBean(ProjectProperties.class);
+        return projectProperties.getBirService().equals("true");
+    }
+
+    public static String getBaseUrl(){
+        ProjectProperties projectProperties = SpringUtils.getBean(ProjectProperties.class);
+        return projectProperties.getBirServiceUrl();
+    }
+
+    public static R get(String action){
+        return get(action,null);
+    }
+
+    public static R get(String action,Object query){
+        String baseUrl = getBaseUrl();
+        String url = "/"+action;
+        if(query!=null){
+            Map map = JsonUtil.objectToMap(query);
+            String params = HttpUtil.createUrl(map);
+            if(url.contains("?")){
+                url = url+params;
+            }else {
+                url = url+"?"+params;
+            }
+        }
+        HashMap<String,String> hearders = new HashMap<>();
+        HttpServletRequest request = ServletUtils.getRequest();
+        String tenant = request.getHeader(GySysConst.TENANT_PROP);
+        String token = request.getHeader(GySysConst.AUTHORIZATION_PROP);
+        hearders.put(GySysConst.TENANT_PROP,tenant);
+        hearders.put(GySysConst.AUTHORIZATION_PROP,token);
+        //自动封装翻页参数
+        if(!url.contains("?")){
+            url += "?";
+        }
+        if(PageUtil.getPageSize()!=null){
+            url += "&pageSize="+PageUtil.getPageSize();
+        }
+        if(PageUtil.getPageNum()!=null){
+            url += "&pageNum="+PageUtil.getPageNum();
+        }
+        url = baseUrl + url;
+        url = url.replace("//","/");
+        url = url.replace("http:/","http://");
+        url = url.replace("https:/","https://");
+        log.debug("请求BIR中转URL:{}",url);
+        String result = HttpUtil.doGet(url,hearders);
+        log.debug("请求BIR中转URL:{}\n数据返回：{}",url,result);
+        JSONObject object = JSON.parseObject(result);
+        Integer status = object.getInteger("status");
+        String msg = object.getString("msg");
+        Object data = object.get("data");
+        R r = R.ok(data);
+        r.setStatus(status);
+        r.setMsg(msg);
+        return r;
+    }
+
+    public static R post(String action,Object query){
+        String baseUrl = getBaseUrl();
+        String url = baseUrl+"/"+action;
+
+        HashMap<String,String> hearders = new HashMap<>();
+        HttpServletRequest request = ServletUtils.getRequest();
+        String tenant = request.getHeader(GySysConst.TENANT_PROP);
+        String token = request.getHeader(GySysConst.AUTHORIZATION_PROP);
+        hearders.put(GySysConst.TENANT_PROP,tenant);
+        hearders.put(GySysConst.AUTHORIZATION_PROP,token);
+        //自动封装翻页参数
+//        if(!url.contains("?")){
+//            url += "?";
+//        }
+//        if(PageUtil.getPageSize()!=null){
+//            url += "&pageSize="+PageUtil.getPageSize();
+//        }
+//        if(PageUtil.getPageNum()!=null){
+//            url += "&pageNum="+PageUtil.getPageNum();
+//        }
+        url = url.replace("//","/");
+        url = url.replace("http:/","http://");
+        url = url.replace("https:/","https://");
+        log.debug("请求BIR中转URL:{}",url);
+        String json = JsonUtil.objectToJson(query);
+        log.debug("请求BIR中转Query:{}",json);
+        String result = HttpUtil.doPost(url,json,hearders);
+        log.debug("请求BIR中转URL:{}\n数据返回：{}",url,result);
+        JSONObject object = JSON.parseObject(result);
+        Integer status = object.getInteger("status");
+        String msg = object.getString("msg");
+        Object data = object.get("data");
+        R r = R.ok(data);
+        r.setStatus(status);
+        r.setMsg(msg);
+        return r;
+    }
+
+    public static TbsCostSubItem.CostCenterTranStr buildCostCenter(String centerType, String centerId, String centerName, String supplierCode){
+        try {
+            Map<String,String> map = new HashMap<>();
+            map.put("centerType",centerType);
+            map.put("centerId",centerId);
+            map.put("centerName",centerName);
+            map.put("supplierCode",supplierCode);
+            R<?> result = get("/bir/roiRate/getCostCenter",map);
+            String json = result.getData().toString();
+            return JsonUtil.jsonToPojo(json,TbsCostSubItem.CostCenterTranStr.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+}

src/main/java/com/qs/serve/common/util/BusinessDifferenceUtil.java

@@ -0,0 +1,79 @@
+package com.qs.serve.common.util;
+
+import com.qs.serve.common.framework.mybatis.join.annotations.BindEntity;
+import com.qs.serve.common.model.annotation.BusinessDifference;
+import com.qs.serve.common.model.dto.DiffFieldVal;
+import com.qs.serve.modules.bms.entity.BmsSupplierContacts;
+import com.qs.serve.modules.sys.entity.SysBusinessLog;
+import lombok.SneakyThrows;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author YenHex
+ * @since 2023/4/25
+ */
+public class BusinessDifferenceUtil {
+
+    @SneakyThrows
+    public static <T> List<DiffFieldVal> getDifferenceList(T orgVal, T newVal){
+        List<DiffFieldVal> diffFieldValList = new ArrayList<>();
+        if(orgVal==null||newVal==null){
+            return diffFieldValList;
+        }
+        Class<?> clazz = null;
+        try {
+            clazz = Class.forName(orgVal.getClass().getName());
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        if(clazz==null){return diffFieldValList;}
+        Field[] fields = clazz.getDeclaredFields();
+        for (Field field : fields) {
+            for (Annotation annotation : field.getAnnotations()) {
+                if(annotation instanceof BusinessDifference){
+                    BusinessDifference busDiff = (BusinessDifference) annotation;
+                    field.setAccessible(true);
+                    Object orgValue = field.get(orgVal);
+                    Object newValue = field.get(newVal);
+                    if(newValue==null){
+                        continue;
+                    }
+                    if(orgValue==null){
+                        orgValue = "";
+                    }
+                    if(!orgValue.equals(newValue)){
+                        DiffFieldVal fieldVal = new DiffFieldVal();
+                        fieldVal.setField(field.getName());
+                        fieldVal.setNewValue(newValue.toString());
+                        fieldVal.setOrgValue(orgValue.toString());
+                        fieldVal.setComment(busDiff.value());
+                        diffFieldValList.add(fieldVal);
+                    }
+                }
+            }
+        }
+        return diffFieldValList;
+    }
+
+    public static void main(String[] args) {
+        BmsSupplierContacts supplierContacts = new BmsSupplierContacts();
+        supplierContacts.setContactsName("名称1");
+        supplierContacts.setContactsPost("setContactsPost");
+
+
+        BmsSupplierContacts supplierContacts2 = new BmsSupplierContacts();
+        supplierContacts2.setContactsName("名称2");
+        supplierContacts2.setContactsNumber("123456");
+        supplierContacts2.setContactsPost("setContactsPost");
+
+        List<DiffFieldVal> diffFieldValList  =BusinessDifferenceUtil.getDifferenceList(supplierContacts,supplierContacts2);
+        for (DiffFieldVal fieldVal : diffFieldValList) {
+            System.out.println(JsonUtil.objectToJson(fieldVal));
+        }
+    }
+
+}

src/main/java/com/qs/serve/common/util/CodeGenUtil.java

@@ -0,0 +1,147 @@
+package com.qs.serve.common.util;
+
+import cn.hutool.core.util.IdUtil;
+import com.qs.serve.common.config.DevEnvironmentConfig;
+import com.qs.serve.common.framework.redis.RedisService;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.beans.BeansException;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 生成编号
+ * @author YenHex
+ * @since 2023/6/25
+ */
+public class CodeGenUtil {
+
+    @Getter
+    @AllArgsConstructor
+    public enum SourceKey{
+        CostApply("cost_apply"),
+        SalePlan("SalePlan"),
+        Activity("activity"),
+        OmsOrder("OmsOrder"),
+        Verification("verification"),
+        VerificationBatch("verificationBatch"),
+        Policy("policy"),
+        Budget("Budget"),
+        BudgetChange("BudgetChange"),
+        BudgetBatch("BudgetBatch"),
+        AgreeCheck("AgreeCheck"),
+        PolicyItem("policy_item");
+        private String code;
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum SourceDataKey{
+        TagInfo("T","TagInfo"),
+        SaleRegion("S","SaleRegion"),
+        BizRegion("B","BizRegion"),
+        ActivityPayCondition("K","ActivityPayCondition");
+        private String prefix;
+        private String code;
+    }
+
+
+    private static final int split_num = 1000;
+
+
+    final static String[] digits2 = {
+            "A" , "B" , "C" , "D" , "E" ,
+            "F" , "G" , "H" ,"J" , "K" ,
+            "L" , "M" , "N" , "P" ,
+            "Q" , "R" , "T" , "U" , "V" , "W" ,
+            "X" , "Y"
+    };
+
+    public static synchronized Long getIdx(String key){
+        RedisService redisService = SpringUtils.getBean(RedisService.class);
+        Long value = redisService.getLong(key);
+        if(value==null){
+            redisService.set(key,1);
+            value = 1L;
+        }else {
+            value++;
+        }
+        redisService.set(key,value);
+        return value;
+    }
+
+    public synchronized static String generate(SourceKey sourceKey){
+        try {
+            LocalDate localDateTime = LocalDate.now();
+            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMdd");
+            String localTime = df.format(localDateTime);
+            localTime = localTime.substring(2);
+            String key = "code_index:"+sourceKey.getCode()+":"+localTime;
+            return  localTime + getCommonValue(key);
+        } catch (BeansException e) {
+            e.printStackTrace();
+        }
+        return IdUtil.getSnowflakeNextIdStr();
+    }
+
+    public static String getCommonValue(String key){
+        Long value = getIdx(key);
+        String digitsNum = "";
+        String appendStr = value+"";
+        if(value>split_num){
+            appendStr = (value%100)+"";
+            Long d = value/split_num;
+            digitsNum = digits2[d.intValue()];
+        }
+        StringBuilder appendZeros = new StringBuilder();
+        for (int i = (appendStr+digitsNum).length(); i < 3; i++) {
+            appendZeros.append("0");
+        }
+        //用于区分测试环境数据
+        String subflex = DevEnvironmentConfig.isDev()?"TEST":"";
+        return digitsNum + appendZeros + appendStr+subflex;
+    }
+
+    public synchronized static String getDataCode(SourceDataKey dataKey){
+        String key = "code_data_index:"+dataKey.getCode();
+        String commonVal = getCommonValue(key);
+        return dataKey.getPrefix() + commonVal;
+    }
+
+    /**
+     * 32个字符，用来表示32进制
+     */
+    final static char[] digits = {
+            '0' , '1' , '2' , '3' , '4' , '5' ,
+            '6' , '7' , '8' , '9' , 'A' , 'B' ,
+            'C' , 'D' , 'E' , 'F' , 'G' , 'H' ,
+            'J' , 'K' , 'L' , 'M' , 'N' , 'P' ,
+            'Q' , 'R' , 'T' , 'U' , 'V' , 'W' ,
+            'X' , 'Y'
+    };
+
+    /**
+     * 10=>32
+     * @param val
+     * @return
+     */
+    static String digits32(long val) {
+        // 32=2^5=二进制100000
+        int shift = 5;
+        // numberOfLeadingZeros 获取long值从高位连续为0的个数，比如val=0，则返回64
+        // 此处mag=long值二进制减去高位0之后的长度
+        int mag = Long.SIZE - Long.numberOfLeadingZeros(val);
+        int len = Math.max(((mag + (shift - 1)) / shift), 1);
+        char[] buf = new char[len];
+        do {
+            // &31相当于%32
+            buf[--len] = digits[((int) val) & 31];
+            val >>>= shift;
+        } while (val != 0 && len > 0);
+        return new String(buf);
+    }
+
+
+}

src/main/java/com/qs/serve/common/util/DateSplitUtil.java

@@ -0,0 +1,67 @@
+package com.qs.serve.common.util;
+
+import com.qs.serve.common.model.dto.DateSplitDTO;
+import lombok.experimental.UtilityClass;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 分割时间DTO工具类
+ * @author YenHex
+ * @since 2023/6/5
+ */
+@UtilityClass
+public class DateSplitUtil {
+
+    public static List<DateSplitDTO> getSplitDto(LocalDate sDate, LocalDate eDate){
+        int diffYear = eDate.getYear() - sDate.getYear();
+        int diffMonthOfYear = eDate.getMonthValue() - sDate.getMonthValue();
+        int diffMonth = diffYear * 12 + diffMonthOfYear;
+        //最后一个月的年月数
+        int lastYearMonth = eDate.getYear()*100 + eDate.getMonthValue();
+        int firstYearMonth = sDate.getYear()*100 + sDate.getMonthValue();
+        if(diffMonth<1){
+            //同一个月
+            int days = eDate.getDayOfMonth() - sDate.getDayOfMonth() + 1;
+            DateSplitDTO splitDTO = new DateSplitDTO(days,sDate,eDate,lastYearMonth,1);
+            return Arrays.asList(splitDTO);
+        }else {
+            List<DateSplitDTO> dateSplitDTOS = new ArrayList<>();
+            for (int i = 0; i < diffMonth+2; i++) {
+                int sort = i+1;
+                LocalDate newStartDate = sDate.plusMonths(i);
+                int currYearMonth = newStartDate.getYear()*100 + newStartDate.getMonthValue();
+                //第一个月
+                if(firstYearMonth==currYearMonth){
+                    int days = sDate.lengthOfMonth() - sDate.getDayOfMonth() + 1;
+                    //当月最后一天
+                    LocalDate endLocalDate = LocalDate.of(sDate.getYear(),sDate.getMonth(),sDate.lengthOfMonth());
+                    DateSplitDTO splitDTO = new DateSplitDTO(days,sDate,endLocalDate,currYearMonth,sort);
+                    dateSplitDTOS.add(splitDTO);
+                }else if(currYearMonth==lastYearMonth){
+                    int days = eDate.getDayOfMonth();
+                    //当月第一天
+                    LocalDate startDate = newStartDate.withDayOfMonth(1);
+                    DateSplitDTO splitDTO = new DateSplitDTO(days,startDate,eDate,currYearMonth,sort);
+                    dateSplitDTOS.add(splitDTO);
+                    break;
+                }else {
+                    int days = newStartDate.lengthOfMonth();
+                    //当月第一天
+                    LocalDate startDate = newStartDate.withDayOfMonth(1);
+                    //当月最后一天
+                    LocalDate endLocalDate = LocalDate.of(newStartDate.getYear(),newStartDate.getMonth(),newStartDate.lengthOfMonth());
+                    DateSplitDTO splitDTO = new DateSplitDTO(days,startDate,endLocalDate,currYearMonth,sort);
+                    dateSplitDTOS.add(splitDTO);
+                }
+            }
+            return dateSplitDTOS;
+        }
+
+    }
+
+}

src/main/java/com/qs/serve/common/util/DateUtils.java

@@ -5,9 +5,7 @@ import lombok.experimental.UtilityClass;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
+import java.time.*;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
@@ -19,11 +17,37 @@ import java.util.Date;
 @UtilityClass
 public class DateUtils {
 
+    public static Date localDateToDate(LocalDate date){
+        //LocalDate date = LocalDate.of(2006,07,26);
+        ZoneId zone = ZoneId.systemDefault();
+        Instant instant = date.atStartOfDay().atZone(zone).toInstant();
+        java.util.Date da = Date.from(instant);
+        return da;
+    }
+
     public static String getString(DateFormatString format){
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format.getValue());
         return LocalDateTime.now().format(formatter);
     }
 
+
+    public static LocalDate toLocalDate(Date date){
+//        Instant instant = date.toInstant();
+//        ZoneId zoneId = ZoneId.systemDefault();
+//        return instant.atZone(zoneId).toLocalDate();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String str = dateFormat.format(date);
+        String[] a = str.split("-");
+        return LocalDate.of(Integer.parseInt(a[0]),Integer.parseInt(a[1]),Integer.parseInt(a[2]));
+    }
+
+
+    public static Date toDate(LocalDate localDate){
+        ZoneId zoneId = ZoneId.systemDefault();
+        ZonedDateTime zdt = localDate.atStartOfDay(zoneId);
+        return Date.from(zdt.toInstant());
+    }
+
     /**
      * 获取设置后得时间
      * @param time
@@ -95,4 +119,10 @@ public class DateUtils {
                 + value);
     }
 
+    public static int getQuarter(int month) {
+        if (month >= 1 && month <= 3) return 1;
+        else if (month >= 4 && month <= 6) return 2;
+        else if (month >= 7 && month <= 9) return 3;
+        else return 4;
+    }
 }

src/main/java/com/qs/serve/common/util/HttpUtil.java

@@ -0,0 +1,164 @@
+package com.qs.serve.common.util;
+
+import com.alibaba.fastjson.JSONObject;
+import com.qs.serve.common.model.dto.R;
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpEntity;
+import org.apache.http.ParseException;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author YenHex
+ * @since 2022/11/23
+ */
+@Slf4j
+@UtilityClass
+public class HttpUtil {
+
+    private final static String CONTENT_TYPE = "application/json";
+    private final static String CHARSET = "UTF-8";
+    private final static String EN_CONING = "UTF-8";
+
+    public static String doPost(String url, String jsonStr, HashMap<String,String> headers) {
+        CloseableHttpClient client = HttpClientBuilder.create().build();
+        CloseableHttpResponse response = null;
+        String errorMsg = null;
+        try {
+            //设post请求
+            HttpPost post = new HttpPost(url);
+            //创建请求实体传参
+            if(jsonStr!=null){
+                StringEntity postingString = new StringEntity(jsonStr,CHARSET);
+                postingString.setContentEncoding(EN_CONING);
+                //设置post请求参数
+                post.setEntity(postingString);
+            }
+            post.addHeader(HTTP.CONTENT_TYPE,CONTENT_TYPE);
+            if (headers != null) {
+                for (String key : headers.keySet()) {
+                    post.addHeader(key,headers.get(key));
+                }
+            }
+            post.setConfig(
+                RequestConfig.custom()
+                        // 连接超时30秒，减少数据库连接占用时长
+                        // 缩短时长，避免事务时间过长，占用数据库连接
+                        .setConnectTimeout(30*1000)
+                        .build()
+            );
+            //执行post请求
+            response = client.execute(post);
+            //访问成功状态码为200
+            if (response.getStatusLine().getStatusCode() == 200) {
+                return EntityUtils.toString(response.getEntity());
+            }
+        } catch (IOException e) {
+            errorMsg = e.getMessage();
+            e.printStackTrace();
+        }finally {
+            try {
+                client.close();
+                if(response!=null){
+                    response.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return errorMsg;
+    }
+
+    public static String doGet(String url, HashMap<String,String> headers) {
+        CloseableHttpClient httpclient = HttpClients.createDefault();
+        try {
+            HttpGet httpget = new HttpGet(url);
+            httpget.addHeader(HTTP.CONTENT_TYPE,CONTENT_TYPE);
+            if (headers != null) {
+                for (String key : headers.keySet()) {
+                    httpget.addHeader(key,headers.get(key));
+                }
+            }
+            CloseableHttpResponse response = httpclient.execute(httpget);
+            try {
+                if (response.getStatusLine().getStatusCode() == 200) {
+                    return EntityUtils.toString(response.getEntity());
+                }
+            } finally {
+                response.close();
+            }
+        } catch (ClientProtocolException e) {
+            e.printStackTrace();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                httpclient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+    public static String createUrl(Map<String,Object> param){
+        StringBuilder sb = new StringBuilder();
+        for (String key : param.keySet()) {
+            String par = param.get(key).toString();
+            try {
+                par = URLEncoder.encode(par,"UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+            sb.append("&").append(key).append("=").append(par);
+        }
+        return sb.toString();
+    }
+
+    public static R<String> doGetResult(String url,HashMap<String,String> headers){
+        String result = HttpUtil.doGet(url,headers);
+        log.debug("url:{},result:{}",url,result);
+        if(result==null){
+            Assert.throwEx("远程服务连接失败");
+        }
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        Integer status = jsonObject.getInteger("status");
+        String msg = jsonObject.getString("msg");
+        String data = jsonObject.getString("data");
+        return new R(status,msg,data);
+    }
+
+    public static R<String> doPostResult(String url, String jsonStr, HashMap<String,String> headers){
+        String result = HttpUtil.doPost(url,jsonStr,headers);
+        log.debug("url:{},result:{}",url,result);
+        if(result==null){
+            log.warn("jsonStr:{}",jsonStr);
+            Assert.throwEx("远程服务连接失败");
+        }
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        Integer status = jsonObject.getInteger("status");
+        String msg = jsonObject.getString("msg");
+        String data = jsonObject.getString("data");
+        return new R(status,msg,data);
+    }
+
+}

src/main/java/com/qs/serve/common/util/IdUtil.java

@@ -13,6 +13,7 @@ import java.util.Random;
 public class IdUtil extends cn.hutool.core.util.IdUtil {
 
     private static final long BASE_DIFF_MILLIS = 1648013774104L;
+    private static final long BASE_DIFF_MILLIS2 = 1578585779603640320L;
 
     private static final Snowflake snowflake = getSnowflake(1,1);
 
@@ -24,10 +25,12 @@ public class IdUtil extends cn.hutool.core.util.IdUtil {
         return  prefix + String.format("%03d", end2);
     }
 
+
     public static Long timeStampLong() {
         return System.currentTimeMillis()-BASE_DIFF_MILLIS;
     }
 
+
     public static String dateTimeStampId() {
         LocalDateTime localDateTime = LocalDateTime.now();
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
@@ -37,6 +40,13 @@ public class IdUtil extends cn.hutool.core.util.IdUtil {
         return  localTime + String.format("%03d", end2);
     }
 
+    public static String dateTimeId() {
+        LocalDateTime localDateTime = LocalDateTime.now();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+        String localTime = df.format(localDateTime);
+        return  localTime;
+    }
+
     public static String genCode(int len) {
         int max = new Double(Math.pow(10, len)).intValue() - 1;
         Random random = new Random();
@@ -45,7 +55,7 @@ public class IdUtil extends cn.hutool.core.util.IdUtil {
     }
 
     public static long getSnowFlakeId(){
-        return snowflake.nextId();
+        return snowflake.nextId()-BASE_DIFF_MILLIS2;
     }
 
 }

src/main/java/com/qs/serve/common/util/JdbcUtil.java

@@ -0,0 +1,107 @@
+package com.qs.serve.common.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 原生JDBC工具类
+ * @Author JcYen
+ * @Date 2021/6/4
+ */
+@Slf4j
+public class JdbcUtil {
+
+    private static final String[] FILTER_WORD = new String[]{"truncate","create","alter","eval","delete","sp_password"};
+
+    /**
+     * 执行SQL（为安全，拦截delete语句）
+     * @param username
+     * @param password
+     * @param url
+     * @param driverName
+     * @param sql
+     * @return
+     */
+    public static List<Map<String,Object>> query(String username, String password, String url, String driverName, String sql) {
+        //检查SQL，防止SQL执行DDL语句
+        doSqlFilter(sql);
+        List<Map<String,Object>> list = new ArrayList();
+        Connection conn = null;
+        Statement stmt = null;
+        ResultSet rs = null;
+        try {
+            Class.forName(driverName);
+            conn = DriverManager.getConnection(url, username, password);
+            stmt = conn.createStatement();
+            log.debug("JDBC工具类 Preparing SQL: {}",url);
+            rs = stmt.executeQuery(sql);
+            ResultSetMetaData md = rs.getMetaData();
+            int columnCount = md.getColumnCount();
+            while (rs.next()) {
+                Map<String,Object> rowData = new HashMap<>();
+                for (int i = 1; i <= columnCount; i++) {
+                    rowData.put(md.getColumnName(i), rs.getObject(i));
+                }
+                list.add(rowData);
+            }
+        } catch (ClassNotFoundException e) {
+            log.warn(e.getMessage());
+        } catch (SQLException throwables) {
+            log.error(throwables.getMessage());
+        }finally {
+            if(rs!=null){
+                try {
+                    rs.close();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (stmt!=null){
+                try {
+                    stmt.close();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            }
+            if(conn!=null){
+                try {
+                    conn.close();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            }
+            rs = null;
+            stmt = null;
+            conn = null;
+        }
+        return list;
+    }
+
+    private static void doSqlFilter(String sql){
+        boolean unsafe = false;
+        String[] parts = sql.split(" ");
+        for (String part : parts) {
+            if(unsafe){ break; }
+            if(StringUtils.isEmpty(part)){
+                continue;
+            }
+            part = part.trim();
+            for (String filterWord : FILTER_WORD) {
+                if(part.equalsIgnoreCase(filterWord)){
+                    unsafe = true;
+                    break;
+                }
+            }
+        }
+        if(unsafe){
+            //AssertUtil.("非法SQL被拦截 ==> "+sql);
+        }
+    }
+
+}

src/main/java/com/qs/serve/common/util/JsonUtil.java

@@ -2,13 +2,19 @@ package com.qs.serve.common.util;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializeConfig;
+import com.alibaba.fastjson.serializer.SimpleDateFormatSerializer;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.qs.serve.common.framework.interceptor.LocalDateTimeFormatSerializer;
 import lombok.experimental.UtilityClass;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +37,7 @@ public class JsonUtil {
     static {
         MAPPER.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
         MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        MAPPER.registerModule(new JavaTimeModule());
     }
 
     /**
@@ -83,7 +90,12 @@ public class JsonUtil {
     }
 
     public static Map<String,Object> objectToMap(Object object){
-        Map<String,Object> map = JSONObject.parseObject(JSON.toJSONString(object));
+        // 创建SerializeConfig对象，并设置日期时间的格式
+        SerializeConfig config = new SerializeConfig();
+        LocalDateTimeFormatSerializer dateFormatSerializer = new LocalDateTimeFormatSerializer();
+        config.put(LocalDateTime.class, dateFormatSerializer);
+        String jsonString = JSON.toJSONString(object, config);
+        Map<String,Object> map = JSONObject.parseObject(jsonString);
         return map;
     }
 

src/main/java/com/qs/serve/common/util/JumpToUtil.java

@@ -0,0 +1,18 @@
+package com.qs.serve.common.util;
+
+import lombok.experimental.UtilityClass;
+
+/**
+ * @author YenHex
+ * @since 2023/6/8
+ */
+@UtilityClass
+public class JumpToUtil {
+
+    public static String getJumpUrl(String host, String templateCode, String targetId) {
+        return host + "/#/jump?jumpType=apiApproval" +
+                "&targetCode="+templateCode
+                +"&targetId="+targetId;
+    }
+
+}

src/main/java/com/qs/serve/common/util/PageUtil.java

@@ -28,7 +28,7 @@ public class PageUtil {
     private static final String ORDER_TYPE_ASC = "ASC";
     private static final String ORDER_TYPE_DESC = "DESC";
 
-    private static final int MAX_PAGE_SIZE = 66;
+    private static final int MAX_PAGE_SIZE = 100;
 
     public static <T> Page<T> getMbpPage(){
         Integer pageNum = getPageNum();
@@ -55,6 +55,12 @@ public class PageUtil {
     public static Integer getPageNum(){
         Integer pageNum=null;
         String pageNumStr = ServletUtils.getParameter(PAGE_NUM);
+        if(!StringUtils.hasText(pageNumStr)){
+            Object pageNumObj = ServletUtils.getSession().getAttribute(PAGE_NUM);
+            if(pageNumObj!=null){
+                pageNumStr = pageNumObj.toString();
+            }
+        }
         if(StringUtils.hasText(pageNumStr)){
             pageNum = Integer.parseInt(pageNumStr);
         }
@@ -64,6 +70,12 @@ public class PageUtil {
     public static Integer getPageSize(){
         String pageSizeStr = ServletUtils.getParameter(PAGE_SIZE);
         Integer pageSize = null;
+        if(!StringUtils.hasText(pageSizeStr)){
+            Object pageNumObj = ServletUtils.getSession().getAttribute(PAGE_SIZE);
+            if(pageNumObj!=null){
+                pageSizeStr = pageNumObj.toString();
+            }
+        }
         if(StringUtils.hasText(pageSizeStr)){
             pageSize = Integer.parseInt(pageSizeStr);
         }
@@ -86,6 +98,14 @@ public class PageUtil {
         return null;
     }
 
+    public static void setPageSize(String pageSize){
+        ServletUtils.getSession().setAttribute(PAGE_SIZE,pageSize);
+    }
+
+    public static void setPageNum(String pageNum){
+        ServletUtils.getSession().setAttribute(PAGE_NUM,pageNum);
+    }
+
     public static String getOrderType(){
         String orderType = ServletUtils.getParameter(ORDER_TYPE);
         if(StringUtils.hasText(orderType)){

src/main/java/com/qs/serve/common/util/ServletUtils.java

@@ -1,5 +1,6 @@
 package com.qs.serve.common.util;
 
+import com.qs.serve.common.model.consts.GySysConst;
 import lombok.experimental.UtilityClass;
 import org.springframework.http.MediaType;
 import org.springframework.web.context.request.RequestAttributes;
@@ -29,6 +30,11 @@ public class ServletUtils {
         return getRequest().getParameter(name);
     }
 
+    public static String getAuthToken(){
+        HttpServletRequest request = getRequest();
+        return request.getHeader(GySysConst.AUTHORIZATION_PROP);
+    }
+
     /**
      * 获取String参数
      */

src/main/java/com/qs/serve/common/util/SqlServerUtil.java

@@ -0,0 +1,157 @@
+package com.qs.serve.common.util;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.microsoft.sqlserver.jdbc.SQLServerBulkCopy;
+import com.microsoft.sqlserver.jdbc.SQLServerBulkCopyOptions;
+import com.sun.rowset.CachedRowSetImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.type.JdbcType;
+import org.springframework.beans.factory.annotation.Value;
+
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.sql.*;
+import java.util.List;
+
+/**
+ * SQL Server工具类
+ * @author Trouble
+ * @version 1.0
+ * @since 2024-04-25 15:00
+ */
+@Slf4j
+public class SqlServerUtil {
+
+    /**
+     * 批量插入数据库
+     *
+     * @param connectionUrl 数据库连接地址
+     * @param list          要保存的对象集
+     * @throws SQLException 插入对象失败
+     */
+    public static <T> void batchInsert(String connectionUrl, List<T> list) throws SQLException, IllegalAccessException {
+        long start = System.currentTimeMillis();
+        String tableName = null;
+        //获取表名
+        for (T t : list) {
+            TableName tableNameAnnotation = t.getClass().getAnnotation(TableName.class);
+            tableName = tableNameAnnotation.value();
+            break;
+        }
+
+        CachedRowSetImpl crs = getCachedRowSet(connectionUrl, tableName);
+        // 将对象转化为行数据
+        for (Object obj : list) {
+            // 以动指针到插入行(虚拟行)
+            crs.moveToInsertRow();
+            // 设置虚拟行相应的字段与数值；注意：字符串中的字段名与类型要与数据表中的一致
+            Field[] declaredFields = obj.getClass().getDeclaredFields();
+            for (Field field : declaredFields) {
+
+                if(field.getName().equals("serialVersionUID")){
+                    continue;
+                }
+
+                field.setAccessible(true);
+
+                TableField tableField = field.getAnnotation(TableField.class);
+                String fieldName;
+                // 如果字段名不存在，则跳过
+                // 如果字段名为空，则使用默认字段名称
+                if (tableField != null) {
+                    if (!tableField.exist()) {
+                        continue;
+                    }
+                    fieldName = tableField.value();
+                } else {
+                    fieldName = field.getName();
+                }
+                Object fieldValue = field.get(obj);
+
+                if (tableField != null && tableField.jdbcType().equals(JdbcType.FLOAT)) {
+                    crs.updateBigDecimal(fieldName, (BigDecimal) fieldValue);
+                }
+                else {
+                    crs.updateObject(fieldName, fieldValue);
+                }
+            }
+            // 将虚拟行插入缓存
+            crs.insertRow();
+            // 将指针移动到当前行
+            crs.moveToCurrentRow();
+        }
+        saveRows(connectionUrl, tableName, crs, list.size());
+        long end = System.currentTimeMillis();
+        log.info("批量插入数据表{}成功，数量：{}条，耗时：{}ms", tableName, list.size(), end - start);
+    }
+
+    /**
+     * 获取数据表的结构
+     *
+     * @param url       链接对象
+     * @param tableName 表名字
+     * @return 数据表字段初始化的数据对象
+     * @throws SQLException 数据表字段初始化失败
+     */
+    public static CachedRowSetImpl getCachedRowSet(String url, String tableName) throws SQLException {
+        // 链接方式固定(配置)
+        Connection con = connection(url);
+        String sql = String.format("select * from %s where 1 = 0", tableName);
+        // 执行sql语句封装
+        PreparedStatement ps = con.prepareStatement(sql);
+        // 执行语句
+        ResultSet rs = ps.executeQuery();
+        // 创建行操作对象
+        CachedRowSetImpl crs = new CachedRowSetImpl();
+        // 设置表字段
+        crs.populate(rs);
+        // 关闭流资源
+        rs.close();
+        // 关闭数据库链接
+        con.close();
+        // 返回含有表字段的行操作对象
+        return crs;
+    }
+
+    /**
+     * 连接数据库
+     *
+     * @param connectionUrl 链接URL
+     * @return 链接对象
+     * @throws SQLException 建立链接失败异常
+     */
+    public static Connection connection(String connectionUrl) throws SQLException {
+        return DriverManager.getConnection(connectionUrl);
+    }
+
+    /**
+     * 将数据插入数据库
+     *
+     * @param connectionUrl 数据库连接地址
+     * @param tableName     数据表名称
+     * @param crs           数据行操作对象
+     * @param size          数据量
+     * @throws SQLException 插入数据失败异常
+     */
+    public static void saveRows(String connectionUrl, String tableName, CachedRowSetImpl crs, int size) throws SQLException {
+        SQLServerBulkCopyOptions copyOptions = new SQLServerBulkCopyOptions();
+        copyOptions.setKeepIdentity(true);
+        // 设置批量插入的数量
+        copyOptions.setBatchSize(size);
+        // 开启事务
+        copyOptions.setUseInternalTransaction(true);
+        // 配置url
+        SQLServerBulkCopy bulkCopy = new SQLServerBulkCopy(connectionUrl);
+        // 设置批量操作参数
+        bulkCopy.setBulkCopyOptions(copyOptions);
+        // 设置要操作的表名
+        bulkCopy.setDestinationTableName(tableName);
+        // 将数据保存到数据库
+        bulkCopy.writeToServer(crs);
+        // 释放资源
+        crs.close();
+        // 释放资源
+        bulkCopy.close();
+    }
+}

src/main/java/com/qs/serve/common/util/StringUtils.java

@@ -2,6 +2,17 @@ package com.qs.serve.common.util;
 
 import lombok.experimental.UtilityClass;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @author YenHex
  * @since 2022/2/28
@@ -9,6 +20,59 @@ import lombok.experimental.UtilityClass;
 @UtilityClass
 public class StringUtils extends org.springframework.util.StringUtils {
 
+    /** 订单号生成(NEW) **/
+    private static final AtomicInteger SEQ = new AtomicInteger(1000);
+    private static final AtomicInteger SEQ2 = new AtomicInteger(10001);
+    private static final DateTimeFormatter DF_FMT_PREFIX = DateTimeFormatter.ofPattern("yyMMddHHmmssSS");
+    private static ZoneId ZONE_ID = ZoneId.of("Asia/Shanghai");
+
+    public static String generateOrderNo(){
+        LocalDateTime dataTime = LocalDateTime.now(ZONE_ID);
+        if(SEQ.intValue()>9990){
+            SEQ.getAndSet(1000);
+        }
+        return  dataTime.format(DF_FMT_PREFIX)+SEQ.getAndIncrement();
+    }
+
+    public static String genShortId() {
+        // 2 位 年份的后两位 22001 后五位走随机  每天清一次缓存 99999 10
+        StringBuilder idSb = new StringBuilder();
+        /// 年份后两位  和  一年中的第几天
+        LocalDate now = LocalDate.now();
+        String year = now.getYear() + "";
+        year = year.substring(2);
+        String day = now.getDayOfYear() + "";
+        /// 补0
+        if (day.length() < 3) {
+            StringBuilder sb = new StringBuilder();
+            for (int i = day.length(); i < 3; i++) {
+                sb.append("0");
+            }
+            day = sb.append(day).toString();
+        }
+        idSb.append(year).append(day);
+        /// 后五位补随机数
+        if(SEQ2.intValue()>99900){
+            SEQ2.getAndSet(10000);
+        }
+        idSb.append(SEQ2.getAndIncrement());
+        return idSb.toString();
+    }
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 100; i++) {
+            System.out.println(genShortId());
+            //System.out.println(generateOrderNo());
+        }
+    }
+
+    public static String tailorLen(String str,int len){
+        if(StringUtils.hasText(str)&&str.length()>len){
+            return str.substring(0,len-2)+"...";
+        }
+        return str;
+    }
+
     /** 非空 */
     public static boolean isNotEmpty(String str){
         return !isEmpty(str);
@@ -22,6 +86,14 @@ public class StringUtils extends org.springframework.util.StringUtils {
         return false;
     }
 
+    public static String getUrlByList(List<?> list,String param){
+        StringBuilder sb = new StringBuilder();
+        for (Object val : list) {
+            sb.append("&"+param+"="+val);
+        }
+        return sb.toString();
+    }
+
     /**
      * 格式化
      * @param exp 含{}的表达式
@@ -47,4 +119,23 @@ public class StringUtils extends org.springframework.util.StringUtils {
         return a.toString().contains(text);
     }
 
+    public static List<String> splitIdString(String ids){
+        if(ids==null){
+            return null;
+        }
+        if(ids.contains(",")){
+            String[] idsA= ids.split(",");
+            return Arrays.asList(idsA);
+        }
+        return Arrays.asList(ids);
+    }
+
+    public static List<Long> splitIdLong(String ids){
+        List<String> strs = splitIdString(ids);
+        if(strs!=null){
+            return strs.stream().map(Long::parseLong).collect(Collectors.toList());
+        }
+        return null;
+    }
+
 }

src/main/java/com/qs/serve/common/util/TianYiYunSmsUtil.java

@@ -0,0 +1,48 @@
+package com.qs.serve.common.util;
+
+import cn.hutool.crypto.digest.DigestUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+/**
+ * @author YenHex
+ * @since 2024/1/26
+ */
+@Slf4j
+@Service
+public class TianYiYunSmsUtil {
+
+    private final static String url = "http://sms.189ek.com/yktsms/send?";
+
+    private final static String appId = "WIgWyCFn4DnHLtjKBIXBVyZbGevFg3J4";
+
+    private final static String appKey = "bjfsZlF01OZPUzyiCLSFOrOOnfsZhYZJ";
+
+    public static void sendMsg(String code){
+        send("13286630016,15989082884,15913696250",code);
+    }
+
+    public static void send(String phone,String code){
+        //需要发送的手机号(多个号码以英文逗号 “,”分隔) 一次性最多 100 个号码
+        String mobiles = phone;
+        String content = "【嘉士利】尊敬的用户，您预约来访已成功，"+code;
+        String sign = DigestUtil.md5Hex(appId+mobiles+content+appKey);
+        try {
+            String msg = URLEncoder.encode(content,"utf-8");
+            String params = "appid="+ appId +
+                    "&mobile="+ mobiles +
+                    "&msg=" +  msg +
+                    "&sign=" + sign +
+                    "&extPort=";
+            String result = HttpUtil.doPost(url+params,"{}",null);
+            log.debug("sms result = > {}",result);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+}

src/main/java/com/qs/serve/common/util/TreeUtil.java

@@ -47,7 +47,7 @@ public class TreeUtil {
         List<T> trees = new ArrayList<T>();
         for (T treeNode : treeNodes) {
             if (root.equals(treeNode.getParentId())) {
-                trees.add(findChildren(treeNode, treeNodes));
+                trees.add(findChildren(treeNode, treeNodes,1));
             }
         }
         return trees;
@@ -59,15 +59,16 @@ public class TreeUtil {
      * @param treeNodes
      * @return
      */
-    public <T extends TreeNode> T findChildren(T treeNode, List<T> treeNodes) {
+    public <T extends TreeNode> T findChildren(T treeNode, List<T> treeNodes,int level) {
         for (T it : treeNodes) {
             if (treeNode.getId().equals(it.getParentId())) {
                 if (treeNode.getChildren() == null) {
                     treeNode.setChildren(new ArrayList<>());
                 }
-                treeNode.addChildren(findChildren(it, treeNodes));
+                treeNode.addChildren(findChildren(it, treeNodes,level+1));
             }
         }
+        treeNode.setNodeLevel(level);
         return treeNode;
     }
 

src/main/java/com/qs/serve/common/util/ValidateTools.java

@@ -0,0 +1,85 @@
+package com.qs.serve.common.util;
+
+import com.qs.serve.common.framework.exception.BusinessException;
+import lombok.experimental.UtilityClass;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.validator.HibernateValidator;
+import org.springframework.util.CollectionUtils;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.Validation;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+import java.util.List;
+import java.util.Set;
+/**
+ * validate方法中校验工具类
+ * <p>
+ * 只要在实体中加上相应的validate的相关注解即可
+ * </p>
+ *
+ * @author Zed
+ */
+@UtilityClass
+public class ValidateTools {
+    /**
+     * 初始化检查器
+     */
+    private static final ValidatorFactory VALIDATOR_FACTORY = Validation.byProvider(HibernateValidator.class).configure().failFast(false).buildValidatorFactory();
+    private static final Validator VALIDATOR = VALIDATOR_FACTORY.getValidator();
+    /**
+     * 校验返回异常信息
+     *
+     * @param t   实体
+     * @param <T> 实体泛型
+     */
+    public static <T> String validStr(T t) {
+        // 构造返回信息
+        StringBuilder validMessage = new StringBuilder();
+        // 检查实体T
+        Set<ConstraintViolation<T>> set = VALIDATOR.validate(t);
+        // 循环set，获取检查结果
+        for (ConstraintViolation<T> vo : set) {
+            validMessage.append(vo.getMessage()).append(";");
+        }
+        return validMessage.toString();
+    }
+    /**
+     * 校验实体抛出异常
+     *
+     * @param t   实体
+     * @param <T> 实体泛型
+     */
+    public static <T> void valid(T t) {
+        String validStr = validStr(t);
+        // 抛出业务异常
+        if (StringUtils.isNotBlank(validStr)) {
+            throw new BusinessException(validStr,500);
+        }
+    }
+    /**
+     * 校验集合抛出异常
+     *
+     * @param list 列表
+     * @param <T>  实体泛型
+     */
+    public static <T> void valid(List<T> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            throw new BusinessException("数据不存在！",500);
+        }
+        // 构造返回信息
+        StringBuilder validMessageTotal = new StringBuilder();
+        // 遍历
+        for (int i = 0; i < list.size(); i++) {
+            String validStr = validStr(list.get(i));
+            if (StringUtils.isNotBlank(validStr)) {
+                String msg = String.format("第%d条数据校验结果:[%s]\n", i + 1, validStr);
+                validMessageTotal.append(msg);
+            }
+        }
+        // 抛出业务异常
+        if (StringUtils.isNotBlank(validMessageTotal.toString())) {
+            throw new BusinessException(validMessageTotal.toString(),500);
+        }
+    }
+}

src/main/java/com/qs/serve/common/util/WarpUtil.java

@@ -40,11 +40,11 @@ public class WarpUtil extends AnnotationQueryStorage {
             String orderType = ServletUtils.getParameter(ORDER_TYPE_NAME);
             if(StringUtils.isNotEmpty(columnsString)){
                 String[] columns = columnsString.split(",");
-                if(orderType.equals(ORDER_DESC)){
+//                if(orderType.equals(ORDER_DESC)){
-                    queryWrapper.orderByDesc(columns);
+//                    queryWrapper.orderByDesc(columns);
-                }else {
+//                }else {
-                    queryWrapper.orderByAsc(columns);
+//                    queryWrapper.orderByAsc(columns);
-                }
+//                }
             }
         }
         return queryWrapper;

src/main/java/com/qs/serve/common/util/bus/QueryFilterUtil.java

@@ -0,0 +1,29 @@
+package com.qs.serve.common.util.bus;
+
+import com.qs.serve.common.util.Assert;
+import com.qs.serve.modules.vtb.entity.so.VtbActivityCheckSo;
+
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+
+/**
+ * @author YenHex
+ * @since 2024/11/1
+ */
+public class QueryFilterUtil {
+
+    public static void filterSubmitDate(LocalDateTime startDate,LocalDateTime endDate,int maxDays) {
+        filterDate(startDate,endDate,maxDays,"申请时间段");
+    }
+
+    public static void filterDate(LocalDateTime startDate,LocalDateTime endDate,int maxDays,String timeName) {
+        if(startDate==null||endDate==null){
+            Assert.throwEx("请选择"+timeName);
+        }
+        long daysBetween = ChronoUnit.DAYS.between(startDate, endDate);
+        if(daysBetween > maxDays){
+            Assert.throwEx(timeName+"跨度最大值(天)："+maxDays);
+        }
+    }
+
+}

src/main/java/com/qs/serve/common/util/model/DateFormatString.java

@@ -12,6 +12,7 @@ import lombok.Getter;
 public enum DateFormatString {
 
     DATE_TIME("yyyy-MM-dd HH:mm:ss"),
+    DATE_TIME2("yyyy-MM-dd HH:mm:ss.000"),
     DATE_TIME_NUM("yyyyMMddHHmmss"),
     DATE_TIME_CN("yyyy年MM月dd日 HH时mm分ss秒"),
 

src/main/java/com/qs/serve/common/util/model/QsJsonLocalDateTimeDeserializer.java

@@ -0,0 +1,28 @@
+package com.qs.serve.common.util.model;
+
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @author YenHex
+ * @since 2023/7/25
+ */
+public class QsJsonLocalDateTimeDeserializer extends JsonDeserializer<LocalDateTime> {
+
+    final DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    @Override
+    public LocalDateTime deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JacksonException {
+        String val = jsonParser.getText();
+        if (val==null||val.isEmpty()){
+            return null;
+        }
+        return LocalDateTime.parse(val,df);
+    }
+}

src/main/java/com/qs/serve/controller/AdminPortalController.java

@@ -2,28 +2,77 @@ package com.qs.serve.controller;
 
 import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.config.properties.ProjectProperties;
 import com.qs.serve.common.framework.redis.RedisService;
+import com.qs.serve.common.framework.security.model.LoginUserType;
 import com.qs.serve.common.model.annotation.LimitSubmit;
 import com.qs.serve.common.model.annotation.SysLog;
+import com.qs.serve.common.model.consts.GySysConst;
 import com.qs.serve.common.model.consts.RedisCacheKeys;
 import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.model.dto.SimpleKeyValue;
 import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.IdUtil;
+import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.util.*;
+import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.controller.dto.SyLoginParam;
+import com.qs.serve.controller.util.SyKeyLoginUtil;
+import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.modules.bms.service.BmsSupplierAddressService;
+import com.qs.serve.modules.goods.entity.GoodsCategory;
+import com.qs.serve.modules.goods.entity.GoodsSku;
+import com.qs.serve.modules.goods.entity.GoodsSpu;
+import com.qs.serve.modules.goods.mapper.GoodsImminentBatchMapper;
+import com.qs.serve.modules.goods.service.GoodsCategoryRuleService;
+import com.qs.serve.modules.goods.service.GoodsCategoryService;
+import com.qs.serve.modules.goods.service.GoodsSkuService;
+import com.qs.serve.modules.goods.service.GoodsSpuService;
+import com.qs.serve.modules.oms.entity.OmsOrder;
+import com.qs.serve.modules.oms.entity.OmsOrderItem;
+import com.qs.serve.modules.oms.entity.OmsSaleOrder;
+import com.qs.serve.modules.oms.entity.OmsSaleOrderItem;
+import com.qs.serve.modules.oms.mapper.OmsOrderMapper;
+import com.qs.serve.modules.oms.service.OmsOrderItemService;
+import com.qs.serve.modules.oms.service.OmsOrderService;
+import com.qs.serve.modules.oms.service.OmsSaleOrderItemService;
+import com.qs.serve.modules.oms.service.OmsSaleOrderService;
+import com.qs.serve.modules.seeyon.entity.SyAffairStateResult;
+import com.qs.serve.modules.seeyon.enums.SyAffairState;
+import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
 import com.qs.serve.modules.sys.entity.SysTenant;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.entity.dto.SysLoginByPhoneParam;
 import com.qs.serve.modules.sys.entity.dto.SysLoginParam;
 import com.qs.serve.modules.sys.entity.dto.SysResetPwdByPhoneParam;
 import com.qs.serve.modules.sys.mapper.SysNoticeUserMapper;
+import com.qs.serve.modules.sys.service.SysPostUserService;
 import com.qs.serve.modules.sys.service.SysTenantService;
 import com.qs.serve.modules.sys.service.SysUserLoginService;
 import com.qs.serve.modules.sys.service.SysUserService;
+import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
+import com.qs.serve.modules.tbs.entity.TbsActivity;
+import com.qs.serve.modules.tbs.entity.TbsCostApply;
+import com.qs.serve.modules.tbs.service.TbsActivityService;
+import com.qs.serve.modules.tbs.service.TbsCostApplyService;
+import com.qs.serve.modules.third.ThirdTokenUtil;
+import com.qs.serve.modules.tzc.entity.TzcPolicy;
+import com.qs.serve.modules.tzc.service.TzcPolicyService;
+import com.qs.serve.modules.vtb.entity.VtbVerification;
+import com.qs.serve.modules.vtb.entity.VtbVerificationBatch;
+import com.qs.serve.modules.vtb.service.VtbVerificationBatchService;
+import com.qs.serve.modules.vtb.service.VtbVerificationService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -41,6 +90,32 @@ public class AdminPortalController {
     private SysUserLoginService sysUserLoginService;
     private RedisService redisService;
     private SysUserService sysUserService;
+    private ProjectProperties projectProperties;
+    private SeeYonRequestService seeYonRequestService;
+    private TbsCostApplyService costApplyService;
+    private VtbVerificationService verificationService;
+    private VtbVerificationBatchService verificationBatchService;
+    private TzcPolicyService policyService;
+    private TbsActivityService activityService;
+    private GoodsImminentBatchMapper goodsImminentBatchMapper;
+    private OmsOrderMapper omsOrderMapper;
+
+    private OmsOrderService omsOrderService;
+    private OmsOrderItemService omsOrderItemService;
+
+    private OmsSaleOrderService omsSaleOrderService;
+    private OmsSaleOrderItemService omsSaleOrderItemService;
+
+    private BmsSupplierAddressService bmsSupplierAddressService;
+    private GoodsCategoryRuleService goodsCategoryRuleService;
+    private GoodsSpuService goodsSpuService;
+    private GoodsSkuService goodsSkuService;
+    private GoodsCategoryService goodsCategoryService;
+
+    @GetMapping("/getSystemTime")
+    public R<?> getSystemTime(){
+        return R.ok(DateUtils.format(LocalDateTime.now(), DateFormatString.DATE_TIME));
+    }
 
     /**
      * 获取所有租户
@@ -52,6 +127,102 @@ public class AdminPortalController {
         return R.ok(list);
     }
 
+    /**
+     * 致远远程跳转接口
+     * @param param
+     * @param response
+     * @throws IOException
+     */
+    @GetMapping("/syKeyLogin")
+    public void getList(SyLoginParam param, HttpServletResponse response) throws IOException {
+        String templateCode = param.getTemplateCode();
+        String syId = param.getSyId();
+
+        // dev remove
+        if(!StringUtils.hasText(syId)){
+            response.sendRedirect(projectProperties.getWebUrl()+"/#/login?");
+            return;
+        }
+
+        String key = param.getKey();
+        SyAffairStateResult affairStateResult = seeYonRequestService.checkAffairState(key,syId,templateCode);
+
+        // dev add
+        //syId = affairStateResult.getMemberId();
+
+        if(affairStateResult.getState()==SyAffairState.error){
+            response.sendRedirect(projectProperties.getWebUrl()+"/#/login?");
+            return;
+        }
+
+        //通过类型和key获取审批id
+        String targetId = affairStateResult.getTargetId();
+        String affairId = affairStateResult.getAffairId();
+        String memberId = affairStateResult.getMemberId();
+
+        //通过syId生成token
+        String token = sysUserLoginService.loginBySyUserId(syId);
+        if(token==null){
+            response.sendRedirect(projectProperties.getWebUrl()+"/#/login?");
+            return;
+        }else {
+            String jumpUrl = "404";
+            SyAffairState affairState = affairStateResult.getState();
+            if(affairState!=SyAffairState.none&&affairState!=SyAffairState.error){
+                //判断是否当前人员
+                if(syId.equals(memberId)){
+                    //待审列表
+                    if (affairState==SyAffairState.next){
+                        if(templateCode.equals(TbsSeeYonConst.BatchCostCheckConf.Code())){
+                            VtbVerificationBatch object = verificationBatchService.getById(targetId);
+                            jumpUrl = SyKeyLoginUtil.getUnCheckedUrl4BatchVerification(object.getCostApplyId(),affairId,object.getId());
+                        }else if(templateCode.equals(TbsSeeYonConst.CostCheckConf.Code())){
+                            VtbVerification object = verificationService.getById(targetId);
+                            TbsActivity activity = activityService.getById(object.getActivityId());
+                            jumpUrl = SyKeyLoginUtil.getPreCheckUrl4Verification(activity.getCostApplyId(),activity.getId(),object.getId(),affairId);
+                        }else{
+                            jumpUrl = SyKeyLoginUtil.getPreCheckUrl(templateCode,targetId,affairId);
+                        }
+                    }else {
+                        if(templateCode.equals(TbsSeeYonConst.BatchCostCheckConf.Code())){
+                            VtbVerificationBatch object = verificationBatchService.getById(targetId);
+                            jumpUrl = SyKeyLoginUtil.getCheckedUrl4BatchVerification(object.getCostApplyId(),affairId,object.getId());
+                        }else if(templateCode.equals(TbsSeeYonConst.CostCheckConf.Code())){
+                            VtbVerification object = verificationService.getById(targetId);
+                            TbsActivity activity = activityService.getById(object.getActivityId());
+                            jumpUrl = SyKeyLoginUtil.getCheckedDetailUrl4Verification(activity.getCostApplyId(),activity.getId(),object.getId());
+                        }else{
+                            jumpUrl = SyKeyLoginUtil.getCheckedDetailUrl(templateCode,targetId);
+                        }
+                    }
+                }else{
+                    //判断是否创建人，创建人则跳转到详情
+                    SysUser sysUser = sysUserService.getBySyId(syId);
+                    String creator = null;
+                    //非当前表单用户跳转到404页面
+                    if(templateCode.equals(TbsSeeYonConst.CostApplyConf.Code())){
+                        TbsCostApply object = costApplyService.getById(targetId);
+                        creator = object.getCreateBy();
+                    }else if(templateCode.equals(TbsSeeYonConst.CostCheckConf.Code())){
+                        VtbVerification object = verificationService.getById(targetId);
+                        creator = object.getCreateBy();
+                    }else if(templateCode.equals(TbsSeeYonConst.BatchCostCheckConf.Code())){
+                        VtbVerificationBatch object = verificationBatchService.getById(targetId);
+                        creator = object.getCreateBy();
+                    }else if(templateCode.equals(TbsSeeYonConst.PolicyConf.Code())){
+                        TzcPolicy object = policyService.getById(targetId);
+                        creator = object.getCreateBy();
+                    }
+                    if(creator!=null&&creator.equals(sysUser.getId())){
+                        jumpUrl = SyKeyLoginUtil.getMyDetailUrl(templateCode,targetId);
+                    }
+                }
+            }
+            String fontUrl = projectProperties.getWebUrl() + "/#/jump?code=001&token="+token+"&jumpTo="+jumpUrl;
+            log.warn("fontUrl:{}",fontUrl);
+            response.sendRedirect(fontUrl);
+        }
+    }
 
     /**
      * 登录接口
@@ -64,6 +235,24 @@ public class AdminPortalController {
         return R.ok(sysUserLoginService.login(param));
     }
 
+    /**
+     * 登录接口
+     * @return
+     */
+    @PostMapping("/flushToken")
+    public R<?> flushToken(HttpServletRequest request){
+        String token = request.getHeader(GySysConst.AUTHORIZATION_PROP);
+        String userId = JwtUtils.getUserId(token);
+        String client = JwtUtils.getClient(token);
+        String redisKey = com.qs.serve.common.util.StringUtils.format(RedisCacheKeys.LOGIN_KEY_APP,client,userId);
+        Map<String,Object> tokenMap = new HashMap<>(10);
+        String token2 = JwtUtils.generateToken(userId, LoginUserType.SYS_USER,client);
+        redisService.set(redisKey,token2);
+        tokenMap.put("token", token2);
+        tokenMap.put("client",client);
+        return R.ok(tokenMap);
+    }
+
     /**
      * 手机登陆
      * @return
@@ -95,8 +284,8 @@ public class AdminPortalController {
     public R<?> phoneCode(@PathVariable("phone") String phone){
         LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SysUser::getAccount,phone);
-        int count = sysUserService.count(wrapper);
+        Long count = sysUserService.count(wrapper);
-        if(count<1){
+        if(count<1L){
             return R.error("无效手机号，请重新输入");
         }
         String key = RedisCacheKeys.PHONE_KEY+phone;
@@ -105,7 +294,7 @@ public class AdminPortalController {
             code = IdUtil.genCode(6);
         }
         redisService.set(key,code,1, TimeUnit.MINUTES);
-        //TODO send msg
+        // send msg
         return R.ok();
     }
 
@@ -134,5 +323,90 @@ public class AdminPortalController {
         return R.ok();
     }
 
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    @GetMapping("/getOrder/{id}")
+    public R<OmsOrder> getById(@PathVariable("id") String id,String supplierId){
+        AuthContextUtils.setTenant("001");
+        OmsOrder omsOrder = omsOrderService.getById(id);
+        if(omsOrder==null){return R.errorNotFound();}
+        omsOrder.setBrandRuleInfo(goodsCategoryRuleService.getById(omsOrder.getBrandRuleId()));
+        omsOrder.setAddressInfo(bmsSupplierAddressService.getById(omsOrder.getSupplierAddrId()));
+
+        // 关联折扣信息
+        if(StringUtils.hasText(omsOrder.getOaRateId())){
+            SimpleKeyValue obj = omsOrderMapper.getExpiredRateInfo(omsOrder.getOaRateId());
+            omsOrder.setDiscountRateInfo(obj);
+        }
+        if(omsOrder.getSupplierId().toString().equals(supplierId)){
+            LambdaQueryWrapper<OmsOrderItem> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(OmsOrderItem::getOrderId,id);
+            List<OmsOrderItem> list = omsOrderItemService.list(lqw);
+            for (OmsOrderItem orderItem : list) {
+                GoodsSpu goodsSpu = goodsSpuService.getById(orderItem.getSpuId());
+                GoodsCategory goodsCategory = goodsCategoryService.getById(goodsSpu.getCategoryLast());
+                orderItem.setCategoryInfo(goodsCategory);
+                orderItem.setSpuInfo(goodsSpu);
+                GoodsSku goodsSku = goodsSkuService.getById(orderItem.getSkuId());
+                if(goodsSku!=null){
+                    orderItem.setSkuSpecialFlag(goodsSku.getSpecialFlag());
+                }
+                //临期品添加批次对象
+                if(omsOrder.getOrderType().equals(3)&&orderItem.getSkuBatchId()!=null){
+                    orderItem.setBatchInfo(goodsImminentBatchMapper.selectById(orderItem.getSkuBatchId()));
+                }
+            }
+            omsOrder.setOrderItems(list);
+            return R.ok(omsOrder);
+        }
+
+        return R.error();
+    }
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    @GetMapping("/getSaleOrder/{id}")
+    public R<OmsSaleOrder> getSaleOrderById(@PathVariable("id") String id, String supplierId){
+        AuthContextUtils.setTenant("001");
+        OmsSaleOrder omsOrder = omsSaleOrderService.getById(id);
+        if(omsOrder==null){return R.errorNotFound();}
+        omsOrder.setBrandRuleInfo(goodsCategoryRuleService.getById(omsOrder.getBrandRuleId()));
+        omsOrder.setAddressInfo(bmsSupplierAddressService.getById(omsOrder.getSupplierAddrId()));
+
+        // 关联折扣信息
+        if(StringUtils.hasText(omsOrder.getOaRateId())){
+            SimpleKeyValue obj = omsOrderMapper.getExpiredRateInfo(omsOrder.getOaRateId());
+            omsOrder.setDiscountRateInfo(obj);
+        }
+        if(omsOrder.getSupplierId().toString().equals(supplierId)){
+            LambdaQueryWrapper<OmsSaleOrderItem> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(OmsSaleOrderItem::getOrderId,id);
+            List<OmsSaleOrderItem> list = omsSaleOrderItemService.list(lqw);
+            for (OmsSaleOrderItem orderItem : list) {
+                GoodsSpu goodsSpu = goodsSpuService.getById(orderItem.getSpuId());
+                GoodsCategory goodsCategory = goodsCategoryService.getById(goodsSpu.getCategoryLast());
+                orderItem.setCategoryInfo(goodsCategory);
+                orderItem.setSpuInfo(goodsSpu);
+                GoodsSku goodsSku = goodsSkuService.getById(orderItem.getSkuId());
+                if(goodsSku!=null){
+                    orderItem.setSkuSpecialFlag(goodsSku.getSpecialFlag());
+                }
+                //临期品添加批次对象
+                if(omsOrder.getOrderType().equals(3)&&orderItem.getSkuBatchId()!=null){
+                    orderItem.setBatchInfo(goodsImminentBatchMapper.selectById(orderItem.getSkuBatchId()));
+                }
+            }
+            omsOrder.setOrderItems(list);
+            return R.ok(omsOrder);
+        }
+        return R.error();
+    }
+
 
 }

src/main/java/com/qs/serve/controller/CommonController.java

@@ -5,6 +5,7 @@ import com.qs.serve.common.model.annotation.SysLog;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.util.*;
+import com.qs.serve.modules.oss.service.OssService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -32,6 +33,17 @@ public class CommonController {
 
     private UploadProperties uploadProperties;
 
+    private OssService ossService;
+
+    /**
+     * 获取签名
+     * @param request
+     * @return
+     */
+    @GetMapping("/getSign")
+    public R getSign(HttpServletRequest request) {
+        return R.ok(ossService.getPolicySign());
+    }
 
 
     /**

src/main/java/com/qs/serve/controller/WxSvcLoginApi.java

@@ -1,8 +1,10 @@
 package com.qs.serve.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.framework.redis.RedisService;
 import com.qs.serve.common.framework.security.model.LoginUser;
 import com.qs.serve.common.framework.security.model.LoginUserType;
+import com.qs.serve.common.framework.security.service.SysUserDetailsServiceImpl;
 import com.qs.serve.common.model.annotation.SysLog;
 import com.qs.serve.common.model.consts.RedisCacheKeys;
 import com.qs.serve.common.model.dto.R;
@@ -10,15 +12,32 @@ import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.HttpCode;
 import com.qs.serve.common.model.enums.InterType;
 import com.qs.serve.common.util.*;
+import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.mapper.SysTenantMapper;
+import com.qs.serve.modules.sys.service.SysUserService;
+import com.qs.serve.modules.wx.common.conf.WxCpConfig;
+import com.qs.serve.modules.wx.entity.WxApp;
 import com.qs.serve.modules.wx.entity.WxUser;
 import com.qs.serve.modules.wx.entity.dto.WxLoginUser;
+import com.qs.serve.modules.wx.service.WxAppService;
 import com.qs.serve.modules.wx.service.WxUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
+import me.chanjar.weixin.common.bean.WxJsapiSignature;
-import org.springframework.web.bind.annotation.RequestBody;
+import me.chanjar.weixin.common.error.WxErrorException;
-import org.springframework.web.bind.annotation.RequestMapping;
+import me.chanjar.weixin.cp.api.WxCpOAuth2Service;
-import org.springframework.web.bind.annotation.RestController;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.api.WxCpUserService;
+import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl;
+import me.chanjar.weixin.cp.bean.WxCpAgentJsapiSignature;
+import me.chanjar.weixin.cp.bean.WxCpOauth2UserInfo;
+import me.chanjar.weixin.cp.bean.WxCpUser;
+import me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImpl;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -42,6 +61,106 @@ public class WxSvcLoginApi {
 
     private final RedisService redisService;
 
+    private final SysUserDetailsServiceImpl userDetailsService;
+
+    private final SysTenantMapper sysTenantMapper;
+    private final WxAppService wxAppService;
+    private SysUserService sysUserService;
+
+    /**
+     * 企业微信登录
+     * @param wxLoginUser
+     * @param request
+     * @return
+     */
+    @SysLog(title = "企业微信登录",biz = BizType.LOGIN,inter = InterType.API)
+    @PostMapping("/cp")
+    public R<?> loginCompanyApp(@RequestBody @Valid WxLoginUser wxLoginUser, HttpServletRequest request){
+        WxUser wxUser = null;
+        try {
+             wxUser = wxUserService.login(wxLoginUser,request);
+        } catch (Exception e) {
+            Assert.throwEx(e.getMessage());
+        }
+        if(wxUser==null){
+            Assert.throwEx(HttpCode.WX_ERR);
+        }
+        Map<String, Object> objectMap = genTokenInfo(request, wxUser);
+        return R.ok(objectMap);
+    }
+
+    /**
+     * 获取签名授权
+     * @param url
+     * @param request
+     * @return
+     */
+    @GetMapping("/getCpSignature")
+    public R<WxCpAgentJsapiSignature> getCpSignature(String url, HttpServletRequest request) {
+        AuthContextUtils.setTenant("001");
+        String agentIdStr = request.getHeader("agentId");
+        String appId = AuthContextUtils.getAppId();
+        WxApp wxApp = wxAppService.getById(appId);
+        Integer agentId = Integer.parseInt(agentIdStr);
+        // 企业微信登录
+        WxCpService wxCpService = new WxCpServiceImpl();
+        WxCpDefaultConfigImpl config =new WxCpDefaultConfigImpl();
+        config.setAgentId(agentId);
+        config.setCorpSecret(WxCpConfig.getSecret(agentId));
+        config.setCorpId(wxApp.getId());
+        wxCpService.setWxCpConfigStorage(config);
+        WxCpAgentJsapiSignature signature = null;
+        try {
+            signature = wxCpService.createAgentJsapiSignature(url);
+        } catch (WxErrorException e) {
+            log.warn("企业微信签名授权失败：appid{},agentId:{},{}",appId,agentId,e.getMessage());
+        }
+        return R.ok(signature);
+    }
+
+    /**
+     * 企业微信登录
+     * @param wxLoginUser
+     * @param request
+     * @return
+     */
+    @SysLog(title = "企业微信登录",biz = BizType.LOGIN,inter = InterType.API)
+    @PostMapping("/cp4Pc")
+    public R<?> loginCompanyPc(@RequestBody @Valid WxLoginUser wxLoginUser, HttpServletRequest request){
+        WxUser wxUser = null;
+        try {
+            wxUser = wxUserService.login(wxLoginUser,request);
+        } catch (Exception e) {
+            Assert.throwEx(e.getMessage());
+        }
+        if(wxUser==null){
+            Assert.throwEx(HttpCode.WX_ERR);
+        }
+        Map<String, Object> objectMap = genTokenInfo(request, wxUser);
+        return R.ok(objectMap.get("adminTokenInfo"));
+    }
+
+    /**
+     * 小程序登陆(暂测试)
+     * @param wxLoginUser
+     * @param request
+     * @return
+     */
+    @SysLog(title = "小程序登录",biz = BizType.LOGIN,inter = InterType.API)
+    @PostMapping("/ma")
+    public R<?> loginMicroApp(@RequestBody @Valid WxLoginUser wxLoginUser, HttpServletRequest request){
+        WxUser wxUser = null;
+        try {
+             wxUser = wxUserService.login(wxLoginUser,request);
+        } catch (Exception e) {
+            log.warn(e.getMessage());
+        }
+        if(wxUser==null){
+            Assert.throwEx(HttpCode.WX_ERR);
+        }
+        Map<String, Object> objectMap = genTokenInfo(request, wxUser);
+        return R.ok(objectMap);
+    }
 
     /**
      * 公众号登录
@@ -52,23 +171,44 @@ public class WxSvcLoginApi {
     @SysLog(title = "公众号登录",biz = BizType.LOGIN,inter = InterType.API)
     @PostMapping("/mp")
     public R<?> login(@RequestBody @Valid WxLoginUser wxLoginUser, HttpServletRequest request){
-        Map<String,Object> objectMap = new HashMap<>();
         WxUser wxUser = null;
         try {
-            wxUser = wxUserService.login(wxLoginUser);
+            wxUser = wxUserService.login(wxLoginUser,request);
         } catch (Exception e) {
             log.warn(e.getMessage());
         }
         if(wxUser==null){
             Assert.throwEx(HttpCode.WX_ERR);
         }
+        Map<String, Object> objectMap = genTokenInfo(request, wxUser);
+        return R.ok(objectMap);
+    }
+
+    @NotNull
+    private Map<String, Object> genTokenInfo(HttpServletRequest request, WxUser wxUser) {
+        Map<String,Object> objectMap = new HashMap<>();
         String token = IdUtil.fastSimpleUUID();
-        String key = RedisCacheKeys.LOGIN_KEY_WX + token;
         LoginUser loginUser = new LoginUser(wxUser.getId(), wxUser.getEmpName(),"",
                 ServletUtils.getIp(request), LoginUserType.APP_USER,new ArrayList<>(),null,AuthContextUtils.getTenant());
-        redisService.set(key, JsonUtil.objectToJson(loginUser.loginUserDTO()),2, TimeUnit.DAYS);
         objectMap.put("token",token);
-        return R.ok(objectMap);
+        //微信登录ID
+        String wxUserKey = StringUtils.format(RedisCacheKeys.WX_KEY_USER,token);
+        redisService.set(wxUserKey, wxUser.getId());
+        //后台管理员信息
+        Map<String,Object> tokenMap = new HashMap<>(10);
+        String client = "wx_app";
+        String redisKey = StringUtils.format(RedisCacheKeys.LOGIN_KEY_APP,client, wxUser.getSysUserId());
+        String pctoken = JwtUtils.generateToken(wxUser.getSysUserId(),loginUser.getTypeFlag(),client);
+        redisService.set(redisKey,pctoken);
+        tokenMap.put("token", pctoken);
+        tokenMap.put("userId", wxUser.getSysUserId());
+        tokenMap.put("IP", loginUser.getLoginIp());
+        tokenMap.put("tenant", sysTenantMapper.selectById(loginUser.getTenant()));
+        tokenMap.put("loginType",client);
+        tokenMap.put("client",client);
+        //关联
+        objectMap.put("adminTokenInfo",tokenMap);
+        return objectMap;
     }
 
     /**
@@ -77,12 +217,28 @@ public class WxSvcLoginApi {
     @PostMapping("/mptest")
     public R<?> login(HttpServletRequest request){
         Map<String,Object> objectMap = new HashMap<>();
-        String token = TokenUtil.desEncrypt(IdUtil.timeStampId());
+        String token = IdUtil.fastSimpleUUID();
-        String key = RedisCacheKeys.LOGIN_KEY_WX + token;
+        //微信登录ID
+        String wxUserKey = StringUtils.format(RedisCacheKeys.WX_KEY_USER,token);
+        redisService.set(wxUserKey,"1");
+
         LoginUser loginUser = new LoginUser("1","微信测试用户","",
                 ServletUtils.getIp(request), LoginUserType.APP_USER,new ArrayList<>(),null,AuthContextUtils.getTenant());
-        redisService.set(key, JsonUtil.objectToJson(loginUser.loginUserDTO()),2, TimeUnit.DAYS);
         objectMap.put("token",token);
+        String sysUserId = "1";
+        Map<String,Object> tokenMap = new HashMap<>(10);
+        String client = "wx_app";
+        String redisKey = StringUtils.format(RedisCacheKeys.LOGIN_KEY_APP,client,sysUserId);
+        String pctoken = JwtUtils.generateToken(sysUserId,loginUser.getTypeFlag(),client);
+        redisService.set(redisKey,pctoken);
+        tokenMap.put("token", pctoken);
+        tokenMap.put("userId", sysUserId);
+        tokenMap.put("IP", loginUser.getLoginIp());
+        tokenMap.put("tenant", sysTenantMapper.selectById(loginUser.getTenant()));
+        tokenMap.put("loginType",client);
+        tokenMap.put("client",client);
+        //关联
+        objectMap.put("adminTokenInfo",tokenMap);
         return R.ok(objectMap);
     }
 

src/main/java/com/qs/serve/controller/dto/SyLoginParam.java

@@ -0,0 +1,27 @@
+package com.qs.serve.controller.dto;
+
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2023/6/8
+ */
+@Data
+public class SyLoginParam {
+
+    /**
+     * 模板编码
+     */
+    private String templateCode;
+
+    /**
+     * 表单data的exsp5字段值
+     */
+    private String key;
+
+    /**
+     * 致远员工id
+     */
+    private String syId;
+
+}

src/main/java/com/qs/serve/controller/util/SyKeyLoginUtil.java

@@ -0,0 +1,146 @@
+package com.qs.serve.controller.util;
+
+import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
+import lombok.experimental.UtilityClass;
+
+/**
+ * @author YenHex
+ * @since 2023/6/12
+ */
+@UtilityClass
+public class SyKeyLoginUtil {
+
+    /**
+     * 获取待审批详情
+     * @param templateCode
+     * @param targetId
+     * @param affairId
+     * @return
+     */
+    public static String getPreCheckUrl(String templateCode,String targetId,String affairId){
+        if(templateCode.equals(TbsSeeYonConst.CostApplyConf.Code())
+                ||templateCode.equals(TbsSeeYonConst.CostApplyContractConf.Code())){
+            return "my-expense-application-approval-pending-detail?expenseApplicationId="+targetId+"&approvalId="+affairId;
+        }
+
+        if(templateCode.equals(TbsSeeYonConst.CheckCostAgreeConf.Code())){
+            return "my-expense-application-agreement-terms-approval-pending-detail?agreementTermsId="+targetId+"&approvalId="+affairId;
+        }
+
+//        if(templateCode.equals(TbsSeeYonConst.CostCheckConf.Code())){
+//            return "my-expense-application-activity-write-off-approval-pending-detail?" +
+//                    "expenseApplicationId=382658" + //费用id
+//                    "&writeOffId=1936474" + //核销id
+//                    "&activityId=2277848" + //活动id
+//                    "&approvalId="+affairId;
+//        }
+        if(templateCode.equals(TbsSeeYonConst.PolicyConf.Code())){
+            return "my-policy-application-approval-pending-detail?policyApplicationId=" + targetId +
+                    "&approvalId="+affairId;
+        }
+        return "404";
+    }
+
+    /**
+     * 获取核销待审批详情
+     * @param costApplyId
+     * @param activityId
+     * @param verificationId
+     * @param affairId
+     * @return
+     */
+    public static String getPreCheckUrl4Verification(Long costApplyId,
+                                                     Long activityId,
+                                                     Long verificationId,
+                                                     String affairId){
+        return "my-expense-application-activity-write-off-approval-pending-detail?" +
+                "expenseApplicationId=" + costApplyId+ //费用id
+                "&writeOffId=" + verificationId +//核销id
+                "&activityId=" + activityId +//活动id
+                "&approvalId="+affairId;
+    }
+
+
+    /**
+     * 获取已审批详情
+     * @param templateCode
+     * @param targetId
+     * @return
+     */
+    public static String getCheckedDetailUrl(String templateCode,String targetId){
+        if(templateCode.equals(TbsSeeYonConst.CostApplyConf.Code())){
+            return "my-expense-application-approval-approved-detail?expenseApplicationId="+targetId
+                    +"&approvalId=0";
+        }
+        if(templateCode.equals(TbsSeeYonConst.PolicyConf.Code())){
+            return "my-channel-discount-policy-application-approval-pending-detail?channelDiscountPolicyApplicationId="+targetId+"&approvalId=0";
+        }
+        return "404";
+    }
+
+    /**
+     * 获取核销待审批详情
+     * @param costApplyId
+     * @param activityId
+     * @param verificationId
+     * @return
+     */
+    public static String getCheckedDetailUrl4Verification(Long costApplyId,
+                                                     Long activityId,
+                                                     Long verificationId){
+        return "my-expense-application-activity-write-off-approval-approved-detail?" +
+                "expenseApplicationId=" + costApplyId+ //费用id
+                "&writeOffId=" + verificationId +//核销id
+                "&activityId=" + activityId +//活动id
+                "&approvalId=0";
+    }
+
+    /**
+     * 获取个人申请详情
+     * @param templateCode
+     * @param targetId
+     * @return
+     */
+    public static String getMyDetailUrl(String templateCode,String targetId){
+        if(templateCode.equals(TbsSeeYonConst.CostApplyConf.Code())
+            || templateCode.equals(TbsSeeYonConst.BatchCostCheckConf.Code())
+            ){
+            return "my-expense-application-detail?id="+targetId;
+        }
+        if(templateCode.equals(TbsSeeYonConst.PolicyConf.Code())){
+            return "my-policy-application-detail?id="+targetId;
+        }
+        return "404";
+    }
+
+
+    /**
+     * 获取批量核销已审批详情
+     * @param costApplyId
+     * @param batchId
+     * @param affairId
+     * @return
+     */
+    public static String getCheckedUrl4BatchVerification(Long costApplyId, String affairId,Long batchId){
+        return "my-expense-application-activity-batch-write-off-approval-approved-detail?" +
+                "expenseApplicationId=" + costApplyId +
+                "&approvalId=" + affairId +
+                "&batchWriteOffId=" + batchId;
+
+    }
+
+    /**
+     * 获取批量核销已审批详情
+     * @param costApplyId
+     * @param batchId
+     * @param affairId
+     * @return
+     */
+    public static String getUnCheckedUrl4BatchVerification(Long costApplyId, String affairId,Long batchId){
+        return "my-expense-application-activity-batch-write-off-approval-pending-detail?" +
+                "expenseApplicationId=" + costApplyId +
+                "&approvalId=" + affairId +
+                "&batchWriteOffId=" + batchId;
+    }
+
+}

src/main/java/com/qs/serve/modules/base/ErpDataBaseService.java

@@ -0,0 +1,40 @@
+package com.qs.serve.modules.base;
+
+import cn.hutool.crypto.digest.DigestUtil;
+import com.qs.serve.common.config.properties.QiShengDsProperties;
+import com.qs.serve.common.util.HttpUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+/**
+ * @author YenHex
+ * @since 2024/1/26
+ */
+@Slf4j
+@Service
+public class ErpDataBaseService {
+
+    @Autowired
+    private QiShengDsProperties qiShengDsProperties;
+
+    public static String erpJslGroupDbConnectionUrl;
+
+    public static String getErpJslGroupDbConnectionUrl(){
+        return erpJslGroupDbConnectionUrl;
+    }
+
+    @PostConstruct
+    public void initErpJslGroupDbConnectionUrl() {
+        log.warn("数据库加载... ErpJslGroupDbConnectionUrl:{}",erpJslGroupDbConnectionUrl);
+        erpJslGroupDbConnectionUrl = qiShengDsProperties.getUrl()
+                + ";user=" + qiShengDsProperties.getUsername()
+                + ";password=" + qiShengDsProperties.getPassword();
+    }
+
+}

src/main/java/com/qs/serve/modules/base/TencentYunSmsService.java

@@ -52,8 +52,8 @@ public class TencentYunSmsService {
 
         req.setTemplateId(templateId);
 
-        //todo 调整短信模板
+        // 调整短信模板
-        String[] templateParamSet = {code,code,code};
+        String[] templateParamSet = {code};
         req.setTemplateParamSet(templateParamSet);
 
         String[] phoneNumberSet = {"+86"+phone};

src/main/java/com/qs/serve/modules/base/TianYiYunSmsService.java

@@ -0,0 +1,48 @@
+package com.qs.serve.modules.base;
+
+import cn.hutool.crypto.digest.DigestUtil;
+import com.qs.serve.common.util.HttpUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+/**
+ * @author YenHex
+ * @since 2024/1/26
+ */
+@Slf4j
+@Service
+public class TianYiYunSmsService {
+
+    private final String url = "http://sms.189ek.com/yktsms/send?";
+
+    @Value("${tianyi.sms.appid}")
+    private String appId;
+
+    @Value("${tianyi.sms.appKey}")
+    private String appKey;
+
+    public void send(String phone,String code){
+        //需要发送的手机号(多个号码以英文逗号 “,”分隔) 一次性最多 100 个号码
+        String mobiles = phone;
+        String content = "【嘉士利】验证码"+code;
+        String sign = DigestUtil.md5Hex(appId+mobiles+content+appKey);
+        try {
+            String msg = URLEncoder.encode(content,"utf-8");
+            String params = "appid="+ appId +
+                    "&mobile="+ mobiles +
+                    "&msg=" +  msg +
+                    "&sign=" + sign +
+                    "&extPort=";
+            String result = HttpUtil.doPost(url+params,"{}",null);
+            log.debug("sms result = > {}",result);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+}

src/main/java/com/qs/serve/modules/base/controller/JslApiController.java

@@ -0,0 +1,122 @@
+package com.qs.serve.modules.base.controller;
+
+import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.model.annotation.SysLog;
+import com.qs.serve.common.model.consts.GySysConst;
+import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.model.enums.BizType;
+import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.util.AuthContextUtils;
+import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.util.ValidateTools;
+import com.qs.serve.modules.bms.entity.bo.BmsSupplierBatchBo;
+import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
+import com.qs.serve.modules.bms.service.BmsSupplierService;
+import com.qs.serve.modules.goods.entity.bo.GoodsSpuBatchTasteBo;
+import com.qs.serve.modules.goods.service.GoodsSpuService;
+import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.entity.bo.SysUserBatchBo;
+import com.qs.serve.modules.sys.entity.bo.SysUserBo;
+import com.qs.serve.modules.sys.service.SysRoleService;
+import com.qs.serve.modules.sys.service.SysUserSalesService;
+import com.qs.serve.modules.sys.service.SysUserService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+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.validation.Valid;
+
+/**
+ * 【嘉士利对接】
+ * @author YenHex
+ * @since 2022/10/28
+ */
+@Slf4j
+@AllArgsConstructor
+//@RestController
+//@RequestMapping("/jsl")
+public class JslApiController {
+
+    private SysUserService sysUserService;
+    private SysRoleService sysRoleService;
+    private BmsSupplierService bmsSupplierService;
+    private SysUserSalesService sysUserSalesService;
+    private GoodsSpuService goodsSpuService;
+
+    /**
+     * 客户档案
+     * @param param
+     * @return
+     */
+    //@PostMapping("/supplier/editBatch")
+    //@SysLog(module = SystemModule.BASE, title = "供应商", biz = BizType.INSERT)
+    @PreAuthorize("hasRole('bms:supplier:insert')")
+    public R<?> editBatch(@RequestBody @Valid BmsSupplierBatchBo param){
+        bmsSupplierService.editBatch(param);
+        return R.ok();
+    }
+
+
+
+    /**
+     * 业务员档案
+     * @param batchBo
+     * @return
+     */
+    //@SysLog(title = "人员",desc = "用户新增",biz = BizType.INSERT)
+    //@PostMapping("/user/editBatch")
+    //@PreAuthorize("hasRole('sys:user:insert')")
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> saveBatch(@RequestBody @Valid SysUserBatchBo batchBo){
+        for (SysUserBo userBo : batchBo.getUserList()) {
+            SysUser dbData = sysUserService.getById(userBo.getId());
+            SysUser param = CopierUtil.copy(userBo,dbData==null?new SysUser():dbData);
+            //设置普通管理员
+            param.setSuperFlag(0);
+            param.setTenantId(AuthContextUtils.getTenant());
+            param.setAccount(param.getMobile());
+            param.setPassword(SecureUtil.md5(GySysConst.DEFAULT_PASSWORD));
+            if(param.getMobile()!=null){
+                param.setAccount(param.getMobile());
+            }
+            //检查手机号是否已用
+            LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
+            wrapper.ne(SysUser::getId,userBo.getId());
+            wrapper.eq(SysUser::getMobile,param.getMobile());
+            Long count = sysUserService.count(wrapper);
+            if(count>0L){
+                return R.error("手机号已被注册");
+            }
+            if(dbData == null){
+                sysUserService.save(param);
+            }else {
+                sysUserService.updateById(param);
+            }
+//            if(param.getId()!=null&& com.qs.serve.common.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){
+//                sysRoleService.saveUserRole4Edit(userBo.getRoleIds(),param.getId());
+//            }
+        }
+        return R.ok();
+    }
+
+
+    /**
+     * (批量)编辑口味品类SPU,建议每次小于50条
+     * @param param
+     * @return
+     */
+    //@PostMapping("/saveBatchTasteSpu")
+    //@SysLog(module = SystemModule.GOODS, title = "spu", biz = BizType.INSERT)
+    //@PreAuthorize("hasRole('goods:spu:insert')")
+    public R<?> saveBatchTasteSpu(@RequestBody GoodsSpuBatchTasteBo param){
+        ValidateTools.valid(param.getTasteProducts());
+        return R.ok(goodsSpuService.saveBatchTasteSpu(param));
+    }
+
+}

src/main/java/com/qs/serve/modules/baz/common/BazTargetTypeConsts.java

@@ -0,0 +1,12 @@
+package com.qs.serve.modules.baz.common;
+
+/**
+ * @author YenHex
+ * @since 2023/4/7
+ */
+public interface BazTargetTypeConsts {
+
+    String POINT = "point";
+    String CUSTOMER = "customer";
+
+}

src/main/java/com/qs/serve/modules/baz/controller/BazVisitController.java

@@ -0,0 +1,148 @@
+package com.qs.serve.modules.baz.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.model.annotation.SysLog;
+import com.qs.serve.common.model.dto.PageVo;
+import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.model.enums.BizType;
+import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.modules.baz.entity.BazVisitFlow;
+import com.qs.serve.modules.baz.service.BazVisitFlowService;
+import com.qs.serve.modules.bms.entity.BmsSupplierVisitForm;
+import com.qs.serve.modules.bms.service.BmsSupplierVisitFormService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import com.qs.serve.modules.baz.entity.BazVisit;
+import com.qs.serve.modules.baz.service.BazVisitService;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 拜访模块 拜访
+ * @author YenHex
+ * @since 2023-04-07
+ */
+@Slf4j
+@AllArgsConstructor
+@RestController
+@RequestMapping("baz/visit")
+public class BazVisitController {
+
+    private BazVisitService bazVisitService;
+
+    private BazVisitFlowService bazVisitFlowService;
+
+    private BmsSupplierVisitFormService bmsSupplierVisitFormService;
+
+    /**
+     * 列表
+     * @param param
+     * @return
+     */
+    @GetMapping("/list")
+    public R<List<BazVisit>> getList(BazVisit param){
+        LambdaQueryWrapper<BazVisit> lqw = new LambdaQueryWrapper<>(param);
+        List<BazVisit> list = bazVisitService.list(lqw);
+        return R.ok(list);
+    }
+
+
+    /**
+     * 获取第一个流程
+     * @param visitId
+     * @return
+     */
+    @GetMapping("/getFirstFlow/{visitId}")
+    @SysLog(module = SystemModule.BAZ, title = "拜访流程", biz = BizType.QUERY)
+    public R<BazVisitFlow> getFirstFlow(@PathVariable("visitId") String visitId){
+        LambdaQueryWrapper<BazVisitFlow> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(BazVisitFlow::getFlowSort,1);
+        lqw.eq(BazVisitFlow::getVisitId,visitId);
+        BazVisitFlow bazVisitFlow = bazVisitFlowService.getOne(lqw,false);
+        if(bazVisitFlow.getFormId()!=null&&!bazVisitFlow.getFormId().equals(0L)){
+            BmsSupplierVisitForm visitForm = bmsSupplierVisitFormService.getById(bazVisitFlow.getFormId());
+            bazVisitFlow.setFormInfo(visitForm);
+        }else {
+            bazVisitFlow.setFormId(null);
+        }
+        return R.ok(bazVisitFlow);
+    }
+
+    /**
+     * 翻页
+     * @param param
+     * @return
+     */
+    //@GetMapping("/page")
+    @PreAuthorize("hasRole('baz:visit:query')")
+    public R<PageVo<BazVisit>> getPage(BazVisit param){
+        LambdaQueryWrapper<BazVisit> lqw = new LambdaQueryWrapper<>(param);
+        PageUtil.startPage();
+        List<BazVisit> list = bazVisitService.list(lqw);
+        return R.byPageHelperList(list);
+    }
+
+    /**
+     * ID查询
+     * @param id
+     * @return
+     */
+    //@GetMapping("/getById/{id}")
+    //@SysLog(module = SystemModule.BAZ, title = "拜访", biz = BizType.QUERY)
+    @PreAuthorize("hasRole('baz:visit:query')")
+    public R<BazVisit> getById(@PathVariable("id") String id){
+        BazVisit bazVisit = bazVisitService.getById(id);
+        return R.ok(bazVisit);
+    }
+
+
+
+    /**
+     * 更新
+     * @param param
+     * @return
+     */
+    //@PostMapping("/updateById")
+    @SysLog(module = SystemModule.BAZ, title = "拜访", biz = BizType.UPDATE)
+    @PreAuthorize("hasRole('baz:visit:update')")
+    public R<?> updateById(@RequestBody @Valid BazVisit param){
+        boolean result = bazVisitService.updateById(param);
+        return R.isTrue(result);
+    }
+
+    /**
+    * 新增
+    * @param param
+    * @return
+    */
+    //@PostMapping("/save")
+    @SysLog(module = SystemModule.BAZ, title = "拜访", biz = BizType.INSERT)
+    @PreAuthorize("hasRole('baz:visit:insert')")
+    public R<?> save(@RequestBody @Valid BazVisit param){
+        boolean result = bazVisitService.save(param);
+        return R.isTrue(result);
+    }
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    //@DeleteMapping("/deleteById/{ids}")
+    @SysLog(module = SystemModule.BAZ, title = "拜访", biz = BizType.DELETE)
+    @PreAuthorize("hasRole('baz:visit:delete')")
+    public R<?> deleteById(@PathVariable("ids") String ids){
+        List<Long> idsLong = StringUtils.splitIdLong(ids);
+        boolean result = bazVisitService.removeByIds(idsLong);
+        return R.isTrue(result);
+    }
+
+}
+

src/main/java/com/qs/serve/modules/baz/controller/BazVisitFlowController.java

@@ -0,0 +1,153 @@
+package com.qs.serve.modules.baz.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.model.annotation.SysLog;
+import com.qs.serve.common.model.dto.PageVo;
+import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.model.enums.BizType;
+import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.modules.baz.entity.bo.BazVisitFlowSortBo;
+import com.qs.serve.modules.bms.entity.BmsSupplierVisitForm;
+import com.qs.serve.modules.bms.service.BmsSupplierVisitFormService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import com.qs.serve.modules.baz.entity.so.BazVisitFlowSo;
+import com.qs.serve.modules.baz.entity.bo.BazVisitFlowBo;
+import com.qs.serve.modules.baz.entity.BazVisitFlow;
+import com.qs.serve.modules.baz.service.BazVisitFlowService;
+
+import javax.validation.Valid;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * 拜访模块 拜访流程
+ * @author YenHex
+ * @since 2023-04-07
+ */
+@Slf4j
+@AllArgsConstructor
+@RestController
+@RequestMapping("baz/visitFlow")
+public class BazVisitFlowController {
+
+    private BazVisitFlowService bazVisitFlowService;
+    private BmsSupplierVisitFormService visitFormService;
+
+    /**
+     * 列表
+     * @param param
+     * @return
+     */
+    @GetMapping("/list")
+    public R<List<BazVisitFlow>> getList(BazVisitFlowSo param){
+        BazVisitFlow entity = CopierUtil.copy(param,new BazVisitFlow());
+        LambdaQueryWrapper<BazVisitFlow> lqw = new LambdaQueryWrapper<>(entity);
+        lqw.orderByAsc(BazVisitFlow::getFlowSort);
+        List<BazVisitFlow> list = bazVisitFlowService.list(lqw);
+        return R.ok(list);
+    }
+
+    /**
+     * 翻页
+     * @param param
+     * @return
+     */
+    @GetMapping("/page")
+    public R<PageVo<BazVisitFlow>> getPage(BazVisitFlowSo param){
+        BazVisitFlow entity = CopierUtil.copy(param,new BazVisitFlow());
+        LambdaQueryWrapper<BazVisitFlow> lqw = new LambdaQueryWrapper<>(entity);
+        PageUtil.startPage();
+        lqw.orderByAsc(BazVisitFlow::getFlowSort);
+        List<BazVisitFlow> list = bazVisitFlowService.list(lqw);
+        return R.byPageHelperList(list);
+    }
+
+    /**
+     * ID查询
+     * @param id
+     * @return
+     */
+    @GetMapping("/getById/{id}")
+    @SysLog(module = SystemModule.BAZ, title = "拜访流程", biz = BizType.QUERY)
+    public R<BazVisitFlow> getById(@PathVariable("id") String id){
+        BazVisitFlow bazVisitFlow = bazVisitFlowService.getById(id);
+        if(bazVisitFlow.getFormId()!=null&&!bazVisitFlow.getFormId().equals(0L)){
+            BmsSupplierVisitForm visitForm = visitFormService.getById(bazVisitFlow.getFormId());
+            bazVisitFlow.setFormInfo(visitForm);
+        }else {
+            bazVisitFlow.setFormId(null);
+        }
+        return R.ok(bazVisitFlow);
+    }
+
+
+    /**
+     * 更新
+     * @param param
+     * @return
+     */
+    @PostMapping("/updateById")
+    @SysLog(module = SystemModule.BAZ, title = "拜访流程", biz = BizType.UPDATE)
+    public R<?> updateById(@RequestBody @Valid BazVisitFlowBo param){
+        if(param.getId()==null){
+            return R.error2();
+        }
+        bazVisitFlowService.modify(param);
+        return R.ok();
+    }
+
+    /**
+    * 新增
+    * @param param
+    * @return
+    */
+    @PostMapping("/save")
+    @SysLog(module = SystemModule.BAZ, title = "拜访流程", biz = BizType.INSERT)
+    public R<?> save(@RequestBody @Valid BazVisitFlowBo param){
+        param.setId(null);
+        BazVisitFlow visitFlow = bazVisitFlowService.modify(param);
+        return R.ok(visitFlow);
+    }
+
+    /**
+     * 更新排序
+     * @param param
+     * @return
+     */
+    @PostMapping("/sort")
+    @SysLog(module = SystemModule.BAZ, title = "拜访流程", biz = BizType.INSERT)
+    public R<?> sort(@RequestBody @Valid BazVisitFlowSortBo param){
+        List<BazVisitFlowSortBo.Item> items = param.getSortValues();
+        items.sort(Comparator.comparingInt(BazVisitFlowSortBo.Item::getSortValue));
+        for (int i = 0; i < items.size(); i++) {
+            BazVisitFlowSortBo.Item item = items.get(i);
+            BazVisitFlow visitFlow = new BazVisitFlow();
+            visitFlow.setId(item.getId());
+            visitFlow.setFlowSort(i+1);
+            bazVisitFlowService.updateById(visitFlow);
+        }
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/deleteById/{ids}")
+    @SysLog(module = SystemModule.BAZ, title = "拜访流程", biz = BizType.DELETE)
+    public R<?> deleteById(@PathVariable("ids") String ids){
+        List<Long> idsLong = StringUtils.splitIdLong(ids);
+        boolean result = bazVisitFlowService.removeByIds(idsLong);
+        return R.isTrue(result);
+    }
+
+}
+

src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java

@@ -0,0 +1,162 @@
+package com.qs.serve.modules.baz.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.model.annotation.SysLog;
+import com.qs.serve.common.model.dto.PageVo;
+import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.model.enums.BizType;
+import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.util.AuthContextUtils;
+import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.modules.baz.entity.BazVisitInstanceFlow;
+import com.qs.serve.modules.baz.service.BazVisitInstanceFlowService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import com.qs.serve.modules.baz.entity.so.BazVisitInstanceSo;
+import com.qs.serve.modules.baz.entity.BazVisitInstance;
+import com.qs.serve.modules.baz.service.BazVisitInstanceService;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 拜访模块 拜访实例
+ * @author YenHex
+ * @since 2023-04-07
+ */
+@Slf4j
+@AllArgsConstructor
+@RestController
+@RequestMapping("baz/visitInstance")
+public class BazVisitInstanceController {
+
+    private BazVisitInstanceService bazVisitInstanceService;
+    private BazVisitInstanceFlowService bazVisitInstanceFlowService;
+
+    /**
+     * 翻页
+     * @param param
+     * @return
+     */
+    @GetMapping("/page")
+    public R<PageVo<BazVisitInstance>> getPage(BazVisitInstanceSo param){
+        BazVisitInstance query = CopierUtil.copy(param,new BazVisitInstance());
+        if(param.getQueryStartDate()!=null){
+            query.setQueryStartDate(param.getQueryStartDate().atStartOfDay());
+        }
+        if(param.getQueryEndDate()!=null){
+            query.setQueryEndDate(param.getQueryEndDate().atTime(23,59,59));
+        }
+        PageUtil.startPage();
+        List<BazVisitInstance> list = bazVisitInstanceService.selectBazVisitInstanceList(query);
+        return R.byPageHelperList(list);
+    }
+
+    /**
+     * 列表
+     * @param param
+     * @return
+     */
+    @GetMapping("/list")
+    public R<List<BazVisitInstance>> getList(BazVisitInstanceSo param){
+        BazVisitInstance query = CopierUtil.copy(param,new BazVisitInstance());
+        if(param.getQueryStartDate()!=null){
+            query.setQueryStartDate(param.getQueryStartDate().atStartOfDay());
+        }
+        if(param.getQueryEndDate()!=null){
+            query.setQueryEndDate(param.getQueryEndDate().atTime(23,59,59));
+        }
+        List<BazVisitInstance> list = bazVisitInstanceService.selectBazVisitInstanceList(query);
+
+        if(param.getLoadFlowList()!=null&&param.getLoadFlowList().equals(1)){
+            List<Long> ids = list.stream().map(BazVisitInstance::getId).collect(Collectors.toList());
+            ids.add(-1L);
+            LambdaQueryWrapper<BazVisitInstanceFlow> lqw = new LambdaQueryWrapper<>();
+            lqw.in(BazVisitInstanceFlow::getVisitInstanceId,ids);
+            List<BazVisitInstanceFlow> allFlowList = bazVisitInstanceFlowService.list(lqw);
+            Map<Long,List<BazVisitInstanceFlow>> flowListGroupByVisitInstanceId = allFlowList.stream()
+                    .collect(Collectors.groupingBy(BazVisitInstanceFlow::getVisitInstanceId));
+            for (BazVisitInstance instance : list) {
+                List<BazVisitInstanceFlow> fl = flowListGroupByVisitInstanceId.get(instance.getId());
+                instance.setFlowList(fl);
+            }
+        }
+        return R.ok(list);
+    }
+
+    /**
+     * ID查询
+     * @param id
+     * @return
+     */
+    @GetMapping("/getById/{id}")
+    @SysLog(module = SystemModule.BAZ, title = "拜访实例", biz = BizType.QUERY)
+    public R<BazVisitInstance> getById(@PathVariable("id") String id){
+        BazVisitInstance bazVisitInstance = bazVisitInstanceService.getById(id);
+        LambdaQueryWrapper<BazVisitInstanceFlow> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(BazVisitInstanceFlow::getVisitInstanceId,id);
+        List<BazVisitInstanceFlow> flowList = bazVisitInstanceFlowService.list(lqw);
+        bazVisitInstance.setFlowList(flowList);
+        return R.ok(bazVisitInstance);
+    }
+
+    /**
+     * ID查询（流程项）
+     * @param id
+     * @return
+     */
+    @GetMapping("/getByFlowId/{id}")
+    public R<BazVisitInstanceFlow> getByFlowId(@PathVariable("id") String id){
+        BazVisitInstanceFlow instanceFlow = bazVisitInstanceFlowService.getById(id);
+        BazVisitInstance visitInstance = bazVisitInstanceService.getById(instanceFlow.getVisitInstanceId());
+        instanceFlow.setInstanceMainInfo(visitInstance);
+        return R.ok(instanceFlow);
+    }
+
+
+    /**
+     * 更新
+     * @param param
+     * @return
+     */
+    //@PostMapping("/updateById")
+    @SysLog(module = SystemModule.BAZ, title = "拜访实例", biz = BizType.UPDATE)
+    public R<?> updateById(@RequestBody @Valid BazVisitInstance param){
+        boolean result = bazVisitInstanceService.updateById(param);
+        return R.isTrue(result);
+    }
+
+    /**
+    * 新增
+    * @param param
+    * @return
+    */
+    //@PostMapping("/save")
+    @SysLog(module = SystemModule.BAZ, title = "拜访实例", biz = BizType.INSERT)
+    public R<?> save(@RequestBody @Valid BazVisitInstance param){
+        boolean result = bazVisitInstanceService.save(param);
+        return R.isTrue(result);
+    }
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/deleteById/{ids}")
+    @SysLog(module = SystemModule.BAZ, title = "拜访实例", biz = BizType.DELETE)
+    public R<?> deleteById(@PathVariable("ids") String ids){
+        List<Long> idsLong = StringUtils.splitIdLong(ids);
+        boolean result = bazVisitInstanceService.removeByIds(idsLong);
+        return R.isTrue(result);
+    }
+
+}
+

src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java

@@ -0,0 +1,232 @@
+package com.qs.serve.modules.baz.controller.my;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.model.annotation.SysLog;
+import com.qs.serve.common.model.dto.PageVo;
+import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.model.enums.BizType;
+import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.util.*;
+import com.qs.serve.modules.baz.entity.BazVisit;
+import com.qs.serve.modules.baz.entity.BazVisitInstance;
+import com.qs.serve.modules.baz.entity.bo.BazCreateVisitInstanceBo;
+import com.qs.serve.modules.baz.entity.bo.BazVisitInstanceFlowBo;
+import com.qs.serve.modules.baz.entity.so.BazVisitInstanceSo;
+import com.qs.serve.modules.baz.service.BazVisitInstanceService;
+import com.qs.serve.modules.baz.service.BazVisitService;
+import com.qs.serve.modules.sys.service.SysPostService;
+import com.qs.serve.modules.sys.service.SysPostUserService;
+import com.qs.serve.modules.sys.service.SysUserSalesService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 拜访模块 拜访实例(我的)
+ * @author YenHex
+ * @since 2023-04-07
+ */
+@Slf4j
+@AllArgsConstructor
+@RestController
+@RequestMapping("baz/myVisitInstance")
+public class BazMyVisitInstanceController {
+
+    private BazVisitInstanceService bazVisitInstanceService;
+    private BazVisitService visitService;
+    private SysPostUserService postUserService;
+
+
+    /**
+     * 翻页
+     * @param param
+     * @return
+     */
+    @GetMapping("/page")
+    public R<PageVo<BazVisitInstance>> getPage(BazVisitInstanceSo param){
+        BazVisitInstance entity = CopierUtil.copy(param,new BazVisitInstance());
+        LambdaQueryWrapper<BazVisitInstance> lqw = new LambdaQueryWrapper<>(entity);
+        if(param.getQueryStartDate()!=null){
+            lqw.ge(BazVisitInstance::getCreateTime,param.getQueryStartDate());
+        }
+        if(param.getQueryEndDate()!=null){
+            lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate().atTime(23,59,59));
+        }
+        PageUtil.startPage();
+        lqw.eq(BazVisitInstance::getVisitorId, AuthContextUtils.getSysUserId());
+        lqw.orderByDesc(BazVisitInstance::getCreateTime);
+        List<BazVisitInstance> list = bazVisitInstanceService.list(lqw);
+        return R.byPageHelperList(list);
+    }
+
+    /**
+     * 翻页(我的部下)
+     * @param param
+     * @return
+     */
+    @GetMapping("/page4Under")
+    public R<PageVo<BazVisitInstance>> page4Under(BazVisitInstanceSo param){
+        BazVisitInstance entity = CopierUtil.copy(param,new BazVisitInstance());
+        LambdaQueryWrapper<BazVisitInstance> lqw = new LambdaQueryWrapper<>(entity);
+        if(param.getQueryStartDate()!=null){
+            lqw.ge(BazVisitInstance::getCreateTime,param.getQueryStartDate());
+        }
+        if(param.getQueryEndDate()!=null){
+            lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate().atTime(23,59,59));
+        }
+        List<String> userIds = postUserService.listByChildIds(AuthContextUtils.getSysUserId());
+        if(userIds.size()<1){
+            return R.byEmptyList();
+        }
+        String userId = AuthContextUtils.getSysUserId();
+        PageUtil.startPage();
+        lqw.in(BazVisitInstance::getVisitorId, userIds);
+        lqw.ne(BazVisitInstance::getVisitorId,userId);
+        lqw.orderByDesc(BazVisitInstance::getCreateTime);
+        List<BazVisitInstance> list = bazVisitInstanceService.list(lqw);
+        return R.byPageHelperList(list);
+    }
+
+
+    /**
+     * 列表
+     * @param param
+     * @return
+     */
+    @GetMapping("/list")
+    public R<List<BazVisitInstance>> getList(BazVisitInstanceSo param){
+        BazVisitInstance query = CopierUtil.copy(param,new BazVisitInstance());
+        if(param.getQueryStartDate()!=null){
+            query.setQueryEndDate(param.getQueryStartDate().atStartOfDay());
+        }
+        if(param.getQueryEndDate()!=null){
+            query.setQueryEndDate(param.getQueryEndDate().atTime(23,59,59));
+        }
+        param.setVisitorId(AuthContextUtils.getSysUserId());
+        List<BazVisitInstance> list = bazVisitInstanceService.selectBazVisitInstanceList(query);
+        return R.ok(list);
+    }
+
+    /**
+     * 列表(我的部下)
+     * @param param
+     * @return
+     */
+    @GetMapping("/list4Under")
+    public R<List<BazVisitInstance>> list4Under(BazVisitInstanceSo param){
+        BazVisitInstance query = CopierUtil.copy(param,new BazVisitInstance());
+        if(param.getQueryStartDate()!=null){
+            query.setQueryEndDate(param.getQueryStartDate().atStartOfDay());
+        }
+        if(param.getQueryEndDate()!=null){
+            query.setQueryEndDate(param.getQueryEndDate().atTime(23,59,59));
+        }
+        List<String> userIds = postUserService.listByChildIds(AuthContextUtils.getSysUserId());
+        if(userIds.size()<1){
+            return R.ok();
+        }
+
+        String userId = AuthContextUtils.getSysUserId();
+        //PageUtil.startPage();
+        query.setQueryUserIds(userIds);
+        query.setIgnoreUserId(userId);
+        List<BazVisitInstance> list = bazVisitInstanceService.selectBazVisitInstanceList(query);
+        return R.ok(list);
+    }
+
+    /**
+     * 获取用户未完成拜访数量
+     * @param visitId 拜访id
+     * @return
+     */
+    @GetMapping("/getCounter")
+    public R<?> getPage(Long visitId){
+        LambdaQueryWrapper<BazVisitInstance> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(BazVisitInstance::getVisitId,visitId);
+        lqw.eq(BazVisitInstance::getVisitorId,AuthContextUtils.getSysUserId());
+        lqw.eq(BazVisitInstance::getVisitState,0);
+        long unFinished = bazVisitInstanceService.count(lqw);
+        Map<String,Object> map = new HashMap<>();
+        map.put("unFinished",unFinished);
+        return R.ok(map,"ok");
+    }
+
+    /**
+     * 统计创建数量（用于判断当天是否提交）
+     * @param visitId
+     * @param targetId
+     * @return
+     */
+    @GetMapping("/countCreate")
+    public R<?> getPage(String visitId,String targetId){
+        BazVisit bazVisit = visitService.getById(visitId);
+        LambdaQueryWrapper<BazVisitInstance> limitVisitLqw = new LambdaQueryWrapper<>();
+        limitVisitLqw.eq(BazVisitInstance::getVisitorId,AuthContextUtils.getSysUserId());
+        limitVisitLqw.eq(BazVisitInstance::getTargetType,bazVisit.getTargetType());
+        limitVisitLqw.eq(BazVisitInstance::getTargetId,targetId);
+        limitVisitLqw.ge(BazVisitInstance::getCreateTime, LocalDate.now());
+        long count = bazVisitInstanceService.count(limitVisitLqw);
+        return R.ok(count);
+    }
+
+
+    /**
+    * 创建流程
+    * @param param
+    * @return
+    */
+    @PostMapping("/create")
+    @SysLog(module = SystemModule.BAZ, title = "拜访实例", biz = BizType.INSERT)
+    public R<BazVisitInstance> save(@RequestBody @Valid BazCreateVisitInstanceBo param){
+        BazVisitInstance result = bazVisitInstanceService.create(param);
+        return R.ok(result);
+    }
+
+    /**
+     * 提交流程
+     * @param param
+     * @return
+     */
+    @PostMapping("/submitFlow")
+    @SysLog(module = SystemModule.BAZ, title = "拜访实例", biz = BizType.INSERT)
+    public R<BazVisitInstance> save(@RequestBody @Valid BazVisitInstanceFlowBo param){
+        bazVisitInstanceService.submit(param);
+        return R.ok();
+    }
+
+    /**
+     * 完成流程
+     * @param id
+     * @return
+     */
+    @PostMapping("/finished/{instanceId}")
+    @SysLog(module = SystemModule.BAZ, title = "拜访实例", biz = BizType.INSERT)
+    public R<BazVisitInstance> finished(@PathVariable("instanceId")Long id){
+        bazVisitInstanceService.finished(id);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/deleteById/{ids}")
+    @SysLog(module = SystemModule.BAZ, title = "拜访实例", biz = BizType.DELETE)
+    public R<?> deleteById(@PathVariable("ids") String ids){
+        List<Long> idsLong = StringUtils.splitIdLong(ids);
+        LambdaQueryWrapper<BazVisitInstance> lqw = new LambdaQueryWrapper<>();
+        lqw.in(BazVisitInstance::getId,idsLong);
+        lqw.eq(BazVisitInstance::getVisitorId, AuthContextUtils.getSysUserId());
+        boolean result = bazVisitInstanceService.remove(lqw);
+        return R.isTrue(result);
+    }
+
+}
+