Merge remote-tracking branch 'origin/div-20251201' into div-20251201

suishenbang-admin/src/main/java/com/dgtly/web/controller/system/AlertConfigurationController.java

@@ -118,7 +118,6 @@ public class AlertConfigurationController extends BaseController
     {
 
         log.info("新增弹框配置");
-        log.info("222222222{}", JSON.toJSON(alertConfiguration));
         //如果userType为空,则添加所有人通知
         if (StringUtils.isEmpty(alertConfiguration.getUserType())){
             alertConfiguration.setUserType("2");

suishenbang-admin/src/main/resources/application-dev.yml

@@ -67,6 +67,22 @@ user:
 
 # Spring配置
 spring:
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    password: 'Ssbtest#1207'
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 1
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 20
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
   # 模板引擎
   thymeleaf:
     mode: HTML

suishenbang-admin/src/main/resources/application-uat-druid.yml

@@ -53,7 +53,7 @@ spring:
                     enabled: true
                     # 慢SQL记录
                     log-slow-sql: true
-                    slow-sql-millis: 30000
+                    slow-sql-millis: 5000
                     merge-sql: true
                 wall:
                     config:

suishenbang-admin/src/main/resources/application-uat.yml

@@ -10,7 +10,7 @@ ruoyi:
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: /home/admin/project/file
-#  profile: D:/ruoyi/uploadPath
+  #  profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   cloudPath: http://127.0.0.1:8000/
@@ -32,10 +32,18 @@ shop:
 
 #hana数据库数据同步配置
 hana:
+  #  hana-driver: com.sap.db.jdbc.Driver
+  #  hana-url: jdbc:sap://hanaentsltd.nipponpaint.com.cn:30015?reconnect=true
+  #  hana-user: SSB_HANA
+  #  hana-pwd: s$EW12445T
+#  hana-driver: com.sap.db.jdbc.Driver
+#  hana-url: jdbc:sap://hanaentsltd.nipponpaint.com.cn:30015?reconnect=true
+#  hana-user: SSB_HANA
+#  hana-pwd: s$EW12445T
   hana-driver: com.sap.db.jdbc.Driver
-  hana-url: jdbc:sap://hanaentsltd.nipponpaint.com.cn:30015?reconnect=true
+  hana-url: jdbc:sap://hanaentsltp.nipponpaint.com.cn:30015?reconnect=true
   hana-user: SSB_HANA
-  hana-pwd: s$EW12445T
+  hana-pwd: Erty567*
   mysql-driver: com.mysql.jdbc.Driver
 #  mysql-url: jdbc:mysql://pc-uf637rafh16b6nl16.rwlb.rds.aliyuncs.com:3306/ssbtest?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #  mysql-user: ssbtest
@@ -102,12 +110,12 @@ spring:
     include: uat-druid
   # 文件上传
   servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  10MB
-       # 设置总上传的文件大小
-       max-request-size:  20MB
-       location: /data/upload_tmp
+    multipart:
+      # 单个文件大小
+      max-file-size:  10MB
+      # 设置总上传的文件大小
+      max-request-size:  20MB
+      location: /data/upload_tmp
   tms:
     #TMS接口地址
     tmsUrl: https://lbtest.lutms.com/wuliu/apissbzt/ssb_update_authFile.do
@@ -148,12 +156,12 @@ spring:
 
 # MyBatis
 mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.dgtly.**.domain
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
-    # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
+  # 搜索指定包别名
+  typeAliasesPackage: com.dgtly.**.domain
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 加载全局的配置文件
+  configLocation: classpath:mybatis/mybatis-config.xml
 
 # PageHelper分页插件
 pagehelper:

suishenbang-api/src/main/resources/application-uat.yml

@@ -8,7 +8,7 @@ ruoyi:
   copyrightYear: 2020
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: /home/admin/project/file
-  # profile: D:/ruoyi/uploadPath
+  #  profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   #是否开启swagger

suishenbang-common/pom.xml

@@ -8,62 +8,69 @@
         <version>4.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-	
+
     <artifactId>suishenbang-common</artifactId>
-	
+
 	<description>
 	    common通用工具
 	</description>
 
     <dependencies>
-		
+
 		<!-- Spring框架基本的核心工具 -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context-support</artifactId>
 		</dependency>
-		
+
 		<!-- SpringWeb模块 -->
 		<dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
         </dependency>
-        
+
         <!--Shiro核心框架 -->
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-core</artifactId>
 		</dependency>
-        
+
 		<!-- pagehelper 分页插件 -->
 		<dependency>
 			<groupId>com.github.pagehelper</groupId>
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
 		</dependency>
-		
+
 		<!-- 自定义验证注解 -->
         <dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
         </dependency>
-    
+
         <!--常用工具类 -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 		</dependency>
 
-		
+
 		<!-- JSON工具类 -->
 		<dependency>
 		    <groupId>com.fasterxml.jackson.core</groupId>
 		    <artifactId>jackson-databind</artifactId>
+			<version>2.17.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.17.1</version>
 		</dependency>
 
 		<!-- 阿里JSON解析器 -->
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
+			<version>2.0.51</version>
 		</dependency>
 
 		<!-- io常用工具类 -->
@@ -77,19 +84,19 @@
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
 		</dependency>
-		
+
 		<!-- excel工具 -->
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-ooxml</artifactId>
 		</dependency>
-		
+
 		<!-- yml解析器 -->
 		<dependency>
 		    <groupId>org.yaml</groupId>
 		    <artifactId>snakeyaml</artifactId>
 		</dependency>
-		
+
 		<!-- servlet包 -->
         <dependency>
 		    <groupId>javax.servlet</groupId>
@@ -113,5 +120,5 @@
             <artifactId>lombok</artifactId>
         </dependency>
     </dependencies>
-  
-</project>
+
+</project>

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/HanaOrderComponent.java

@@ -168,7 +168,7 @@ public class HanaOrderComponent {
                 "                A.KVGR4, "+
                 "                A.POSID, "+
                 "               A.PD_NO, "+
-                "               A.BSTKD,"+
+                "              REPLACE(A.BSTKD, '$', '') as BSTKD, "+
                 "               A.NETPR, "+
                 "               A.NTGEW_MARA,"+
                 "               A.PSTYV,"+
@@ -356,8 +356,7 @@ public class HanaOrderComponent {
         }
     }*/
 
-    //C类
-    private int  createTmabcTxt(ResultSet result) throws Exception {
+    private int createDeliverSignatureTxt(ResultSet result) throws Exception {
         File file = null;
         FileWriter fw = null;
         Connection conn = null;
@@ -367,19 +366,18 @@ public class HanaOrderComponent {
             long i =0;
 
             //创建IO需求的条件，并声明输出路径
-            file = new File((Global.getTemdataPath()+"erpOrderByC/"));
-            log.info("erpOrderByC数据缓存路径：" + Global.getTemdataPath()+"erpOrderByC/");
+            file = new File((Global.getTemdataPath()+"deliverSignature/"));
+            log.info("deliverSignature数据缓存路径：" + Global.getTemdataPath()+"deliverSignature/");
             if(!file.exists()){
                 file.mkdir();
             }
 
-            file = new File(Global.getTemdataPath()+"erpOrderByC/"+j+".txt");
+            file = new File(Global.getTemdataPath()+"deliverSignature/"+j+".txt");
             if(!file.exists()){
                 file.createNewFile();
             }else {
                 //取得这个目录下的所有子文件对象
-                File[] files = new File(Global.getTemdataPath()+"erpOrderByC/").listFiles();
-                //遍历该目录下的文件对象
+                File[] files = new File(Global.getTemdataPath()+"deliverSignature/").listFiles();
 
                 for (File f: files){
                     f.delete();
@@ -392,18 +390,31 @@ public class HanaOrderComponent {
             while (result.next()){
 
                 fw.write(
-                        result.getString("MAABC")
-                                +"$$"+ result.getString("SPRAS")
-                                +"$$"+ result.getString("TMABC")
+                        result.getString("VBELN")
+                         +"$$"+ result.getString("POSNR")
+                                +"$$"+ result.getString("MATNR")
+                                +"$$"+ result.getString("VGBEL")
+                                +"$$"+ result.getString("VGPOS")
+                                +"$$"+ result.getString("ERDAT_SO")
+                                +"$$"+ result.getString("LFIMG")
+                                +"$$"+ result.getString("MODIFIEDVALUE")
+                                +"$$"+ result.getString("LFIMG_CY")
+                                +"$$"+ result.getString("ZDATE_KH")
+                                +"$$"+ result.getString("ZTIME_KH")
+                                +"$$"+ result.getString("ZVBELN_YCHH")
+                                +"$$"+ result.getString("ZSTATUS_HH")
+                                +"$$"+ result.getString("CONTRACTID")
+                                +"$$"+ result.getString("BIZNO")
                                 +"$$"+ result.getString("MANDT")
                                 + "\r\n");
 
+
                 fw.flush();
                 i++;
                 if (i%50000==0){
                     j++;
                     //创建IO需求的条件，并声明输出路径
-                    file = new File(Global.getTemdataPath()+"erpOrderByC/"+j+".txt");
+                    file = new File(Global.getTemdataPath()+"deliverSignature/"+j+".txt");
                     if(!file.exists()){
                         file.createNewFile();
                     }else {
@@ -415,8 +426,7 @@ public class HanaOrderComponent {
                 }
             }
             Long endTime = System.currentTimeMillis();
-            log.info("生成erpOrderByC-TXT用时：" + (endTime - startTime) + "毫秒");
-
+            log.info("生成deliverSignature-TXT用时：" + (endTime - startTime) + "毫秒");
 
         }catch (Exception e){
             e.printStackTrace();
@@ -442,9 +452,9 @@ public class HanaOrderComponent {
         return j;
     }
 
-//电子单签收
 
-    private int createDeliverSignatureTxt(ResultSet result) throws Exception {
+    //C类
+    private int  createTmabcTxt(ResultSet result) throws Exception {
         File file = null;
         FileWriter fw = null;
         Connection conn = null;
@@ -454,18 +464,19 @@ public class HanaOrderComponent {
             long i =0;
 
             //创建IO需求的条件，并声明输出路径
-            file = new File((Global.getTemdataPath()+"deliverSignature/"));
-            log.info("deliverSignature数据缓存路径：" + Global.getTemdataPath()+"deliverSignature/");
+            file = new File((Global.getTemdataPath()+"erpOrderByC/"));
+            log.info("erpOrderByC数据缓存路径：" + Global.getTemdataPath()+"erpOrderByC/");
             if(!file.exists()){
                 file.mkdir();
             }
 
-            file = new File(Global.getTemdataPath()+"deliverSignature/"+j+".txt");
+            file = new File(Global.getTemdataPath()+"erpOrderByC/"+j+".txt");
             if(!file.exists()){
                 file.createNewFile();
             }else {
                 //取得这个目录下的所有子文件对象
-                File[] files = new File(Global.getTemdataPath()+"deliverSignature/").listFiles();
+                File[] files = new File(Global.getTemdataPath()+"erpOrderByC/").listFiles();
+                //遍历该目录下的文件对象
 
                 for (File f: files){
                     f.delete();
@@ -478,31 +489,18 @@ public class HanaOrderComponent {
             while (result.next()){
 
                 fw.write(
-                        result.getString("VBELN")
-                         +"$$"+ result.getString("POSNR")
-                                +"$$"+ result.getString("MATNR")
-                                +"$$"+ result.getString("VGBEL")
-                                +"$$"+ result.getString("VGPOS")
-                                +"$$"+ result.getString("ERDAT_SO")
-                                +"$$"+ result.getString("LFIMG")
-                                +"$$"+ result.getString("MODIFIEDVALUE")
-                                +"$$"+ result.getString("LFIMG_CY")
-                                +"$$"+ result.getString("ZDATE_KH")
-                                +"$$"+ result.getString("ZTIME_KH")
-                                +"$$"+ result.getString("ZVBELN_YCHH")
-                                +"$$"+ result.getString("ZSTATUS_HH")
-                                +"$$"+ result.getString("CONTRACTID")
-                                +"$$"+ result.getString("BIZNO")
+                        result.getString("MAABC")
+                                +"$$"+ result.getString("SPRAS")
+                                +"$$"+ result.getString("TMABC")
                                 +"$$"+ result.getString("MANDT")
                                 + "\r\n");
 
-
                 fw.flush();
                 i++;
                 if (i%50000==0){
                     j++;
                     //创建IO需求的条件，并声明输出路径
-                    file = new File(Global.getTemdataPath()+"deliverSignature/"+j+".txt");
+                    file = new File(Global.getTemdataPath()+"erpOrderByC/"+j+".txt");
                     if(!file.exists()){
                         file.createNewFile();
                     }else {
@@ -514,7 +512,8 @@ public class HanaOrderComponent {
                 }
             }
             Long endTime = System.currentTimeMillis();
-            log.info("生成deliverSignature-TXT用时：" + (endTime - startTime) + "毫秒");
+            log.info("生成erpOrderByC-TXT用时：" + (endTime - startTime) + "毫秒");
+
 
         }catch (Exception e){
             e.printStackTrace();

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/EsignController.java

@@ -21,6 +21,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tomcat.util.digester.ArrayStack;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -69,6 +70,8 @@ public class EsignController extends ApiBaseController {
     private ICustomersCodeService customersService;
     @Autowired
     private ISysUserCustomerAuthorizationService authorizationService;
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
     /**
      * @description: 经销商订单签收方法
      * 没有注册就注册，注册完就认证，然后再点击签署按钮，获取经销商用户id，对应主体id
@@ -743,6 +746,12 @@ public class EsignController extends ApiBaseController {
 //       /*根据org_code查询多个经销商列表*/
         List<SysUserExt> sysUserExtList = new ArrayStack<>();
         List<AssRelcustomerinfo>  assRelcustomerinfoList= assRelcustomerinfoService.selectRelcustomerinfoListByorgCode(sysUser.getSysUserExt().getOrgCode(),sysUser.getUserId().toString());
+        List<String> res = new ArrayList<>();
+        List<Map<String,Object>> custInfo = jdbcTemplate.queryForList("select  customerCode from cust_exclusion_info  where  userId=?",userId);
+        res=custInfo.stream()
+                .map(row -> (String) row.get("customerCode"))
+                .collect(Collectors.toList());
+
         if (assRelcustomerinfoList.size()>0){
             for (AssRelcustomerinfo ar:assRelcustomerinfoList) {
                 SysUserExt sysUserExt = new SysUserExt();
@@ -757,7 +766,10 @@ public class EsignController extends ApiBaseController {
                 sysUserExt.setIsCustomerManager(sysUser.getSysUserExt().getIsCustomerManager());
                 sysUserExt.setPostCode(sysUser.getSysUserExt().getPostCode());
                 sysUserExt.setPostName(sysUser.getSysUserExt().getPostName());
-                sysUserExtList.add(sysUserExt);
+                if(!res.contains(ar.getMainkunnr())){
+                    sysUserExtList.add(sysUserExt);
+                }
+
             }
 
             for (AssRelcustomerinfo ar:assRelcustomerinfoList) {
@@ -773,7 +785,10 @@ public class EsignController extends ApiBaseController {
                 sysUserExt.setIsCustomerManager(sysUser.getSysUserExt().getIsCustomerManager());
                 sysUserExt.setPostCode(sysUser.getSysUserExt().getPostCode());
                 sysUserExt.setPostName(sysUser.getSysUserExt().getPostName());
-                sysUserExtList.add(sysUserExt);
+                if(!res.contains(ar.getKunnr())){
+                    sysUserExtList.add(sysUserExt);
+                }
+
             }
             /*SysUserExt sysUserExt = new SysUserExt();
             sysUserExt.setUserId(sysUser.getSysUserExt().getUserId());

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxPortalController.java

@@ -68,13 +68,14 @@ public class WxPortalController extends ApiBaseController {
     private ISysUserCustomerAuthorizationService authorizationService;
     @Autowired
     private ISysUserExtService sysUserExtService;
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
 
     @Autowired
     private ISysUserShopExtService sysUserShopExtService;
 
 
-    @Autowired
-    JdbcTemplate jdbcTemplate;
     @ApiOperation(value = "微信门户首页",notes = "参数：{userId:1}")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "params" , paramType = "body")
@@ -237,6 +238,14 @@ public class WxPortalController extends ApiBaseController {
         /*根据org_code查询多个经销商列表*/
         List<SysUserExt> sysUserExtList = new ArrayList<>();
         List<AssRelcustomerinfo>  assRelcustomerinfoList= assRelcustomerinfoService.selectRelcustomerinfoListByorgCode(customerCode,sysUser.getUserId().toString());
+
+        //查询需要过滤的客户信息
+        List<String> res = new ArrayList<>();
+        List<Map<String,Object>> custInfo = jdbcTemplate.queryForList("select  customerCode from cust_exclusion_info  where  userId=?",userId);
+        res=custInfo.stream()
+                .map(row -> (String) row.get("customerCode"))
+                .collect(Collectors.toList());
+
         if (assRelcustomerinfoList.size()>0){
             for (AssRelcustomerinfo ar:assRelcustomerinfoList) {
                 SysUserExt sysUserExt = new SysUserExt();
@@ -251,7 +260,11 @@ public class WxPortalController extends ApiBaseController {
                 sysUserExt.setIsCustomerManager(sysUser.getSysUserExt().getIsCustomerManager());
                 sysUserExt.setPostCode(sysUser.getSysUserExt().getPostCode());
                 sysUserExt.setPostName(sysUser.getSysUserExt().getPostName());
-                sysUserExtList.add(sysUserExt);
+                if(!res.contains(ar.getMainkunnr())){
+                    sysUserExtList.add(sysUserExt);
+                }
+
+
             }
 
             for (AssRelcustomerinfo ar:assRelcustomerinfoList) {
@@ -267,7 +280,9 @@ public class WxPortalController extends ApiBaseController {
                 sysUserExt.setIsCustomerManager(sysUser.getSysUserExt().getIsCustomerManager());
                 sysUserExt.setPostCode(sysUser.getSysUserExt().getPostCode());
                 sysUserExt.setPostName(sysUser.getSysUserExt().getPostName());
-                sysUserExtList.add(sysUserExt);
+                if(!res.contains(ar.getKunnr())){
+                    sysUserExtList.add(sysUserExt);
+                }
             }
 
             /*
@@ -449,6 +464,8 @@ public class WxPortalController extends ApiBaseController {
     }
 
 
+
+    @ApiOperation(value = "首页突变配置")
     @PostMapping("/getHomeIconInfo")
     public AjaxResult getHoemIconCongif() throws IOException {
         Map<String,Object> iconInfo= wxMagnetService.selectHomeIconInfoById();

suishenbang-wxportal/suishenbang-wxportal-common/pom.xml

@@ -47,7 +47,6 @@
             <artifactId>itext-asian</artifactId>
             <version>5.2.0</version>
         </dependency>
-
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/JedisPoolUtil.java

@@ -1,19 +1,18 @@
 package com.dgtly.wxportal.utils;
 
+import org.springframework.stereotype.Service;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
 
 
-
+@Service
 public class JedisPoolUtil {
     private static volatile JedisPool jedisPool = null;
     private static final String HOST="127.0.0.1" ;
     private static final int PORT = 6379;
     private static final String PASSWORD = "Ssbprod#1207";
     private static final int TIMEOUT = 2000;
-
-
     private JedisPoolUtil() {}
     public static JedisPool getPool() {
         if (jedisPool == null) {

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/java/com/dgtly/wxportal/controller/WxMagnetController.java

@@ -206,12 +206,6 @@ public class WxMagnetController extends BaseController
        return  AjaxResult.success("保存成功!");
     }
 
-    @PostMapping("/getHomeIconInfo")
-    @ResponseBody
-    public AjaxResult getHoemIconCongif() throws IOException {
-        Map<String,Object> iconInfo= wxMagnetService.selectHomeIconInfoById();
-        return  AjaxResult.success(iconInfo);
-    }
 
 
     @Log(title = "redis缓存清除", businessType = BusinessType.UPDATE)
@@ -219,6 +213,8 @@ public class WxMagnetController extends BaseController
     @ResponseBody
     public AjaxResult cleanRedisByDb(@RequestBody RedisDbParam redisDbParam)
     {
+
+
         if(redisDbParam.getRedisDb().length==0){
             return AjaxResult.error(201,"redis库未指定！");
         }
@@ -235,11 +231,21 @@ public class WxMagnetController extends BaseController
                 }
             }
         }
-        return AjaxResult.success("操作成功!");
+        return AjaxResult.success("200","操作成功!");
+    }
+
+
+    @PostMapping("/getHomeIconInfo")
+    @ResponseBody
+    public AjaxResult getHoemIconCongif() throws IOException {
+        Map<String,Object> iconInfo= wxMagnetService.selectHomeIconInfoById();
+        return  AjaxResult.success(iconInfo);
     }
 
 
 
+
+
     /**
      * 加载角色磁贴列表树
      */