update

src/main/java/com/qtzl/alterSales/UserApplication.java

@@ -17,7 +17,7 @@ import org.springframework.web.client.RestTemplate;
 @SpringBootApplication
 @EnableAspectJAutoProxy(proxyTargetClass = true)
 @EnableTransactionManagement
-@EnableScheduling
+// @EnableScheduling
 public class UserApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {

src/main/java/com/qtzl/alterSales/manager/service/EtcOrderUserInfoServiceImpl.java

@@ -44,7 +44,7 @@ public class EtcOrderUserInfoServiceImpl implements EtcOrderUserInfoService {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("未获取到每日下载的人车卡签数据，进入下一周期处理");
         }
         final String newIdNum = userIdNum.stream()
-                .filter(idNum -> idNum.endsWith(desensitizationVo.getIdentNo().substring(desensitizationVo.getIdentNo().lastIndexOf("*") + 1)))
+                .filter(idNum -> !StringUtils.isEmpty(idNum) && idNum.endsWith(desensitizationVo.getIdentNo().substring(desensitizationVo.getIdentNo().lastIndexOf("*") + 1)))
                 .findFirst().orElse(null);
         if (StringUtils.isEmpty(newIdNum)) {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("每日下载数据未匹配到对应的证件号");

src/main/java/com/qtzl/alterSales/manager/tools/AESTools.java

@@ -170,10 +170,10 @@ public class AESTools extends  AbstractManager{
 
 	    public static void main(String[] args) {
 
-	    	String jsonStr="U2FsdGVkX1/UZYi/v51uues6fEVrP2ZAB/JIS+jEEowy5rN+fJ1+aOPnDxiyGjwkpgDVRgQ3nBxLIMp97ZFXIQ==";
-//	    	System.out.println(AESTools.encrypt(jsonStr, "9767d61ab8f34075"));
+	    	String jsonStr="AG37WA5Rowck7cp56ut7N2hHtt9HpbsgLmOssKaJbXl0j+Nwta1npkVb+AwUOOm5";
+	    	System.out.println(AESTools.encrypt(jsonStr, "qtzl2024xzxtmch1"));
 //			System.out.println(AESTools.encrypt("142427198707260019"));
-	    	System.out.println(AESTools.decrypt(jsonStr, "qtzl2024xzxtmch1"));
+//	    	System.out.println(AESTools.decrypt(jsonStr, "qtzl2024xzxtmch1"));
 			//System.out.println(AESTools.decrypt("c2bAsP30K3RCnSa/Cwk7+Q=="));
 		}
 

src/main/resources/application-dev.yml

@@ -96,15 +96,14 @@ spring:
         validation-query: SELECT 'x' FROM DUAL
         validation-query-timeout: 10
       third:
-        # 使用阿里的Druid连接池
-        driver-class-name: com.mysql.cj.jdbc.Driver
         type: com.alibaba.druid.pool.DruidDataSource
+        driver-class-name: org.mariadb.jdbc.Driver
         enableDrds: true
         dialect: org.hibernate.dialect.MySQL5InnoDBDialect
         # 填写你数据库的url、登录名、密码和数据库名 allowMultiQueries=true nj-cdb-m52p6dj5.sql.tencentcdb.com 63865 !@#$%QWERTasdfg hypt_smp
-        jdbc-url: jdbc:mysql://159.75.82.245:3306/etc_unified_order?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false
-        username: ${MYSQL_SERVER_USER:root}
-        password: ${MYSQL_SERVER_PASSWORD:houyi..}
+        jdbc-url: jdbc:mariadb://192.168.101.201:3306/etc_unified_order?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&serverTimezone=UTC
+        username: root
+        password: Qtzl@qwe147
         # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters: stat,wall,slf4j
         initial-size: 5
@@ -126,9 +125,9 @@ spring:
         enableDrds: true
         dialect: org.hibernate.dialect.MySQL5InnoDBDialect
         # 填写你数据库的url、登录名、密码和数据库名 allowMultiQueries=true nj-cdb-m52p6dj5.sql.tencentcdb.com 63865 !@#$%QWERTasdfg hypt_smp
-        jdbc-url: jdbc:mysql://159.75.82.245:3306/etc-user-operate?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false
+        jdbc-url: jdbc:mysql://192.168.100.186:3306/etc-user-operate?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false
         username: ${MYSQL_SERVER_USER:root}
-        password: ${MYSQL_SERVER_PASSWORD:houyi..}
+        password: ${MYSQL_SERVER_PASSWORD:f7Yh@eP6mgzS#}
         # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters: stat,wall,slf4j
         initial-size: 5
@@ -143,6 +142,54 @@ spring:
         time-between-eviction-runs-millis: 50000
         validation-query: select 1
         validation-query-timeout: 10
+#      third:
+#        # 使用阿里的Druid连接池
+#        driver-class-name: com.mysql.cj.jdbc.Driver
+#        type: com.alibaba.druid.pool.DruidDataSource
+#        enableDrds: true
+#        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+#        # 填写你数据库的url、登录名、密码和数据库名 allowMultiQueries=true nj-cdb-m52p6dj5.sql.tencentcdb.com 63865 !@#$%QWERTasdfg hypt_smp
+#        jdbc-url: jdbc:mysql://159.75.82.245:3306/etc_unified_order?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false
+#        username: ${MYSQL_SERVER_USER:root}
+#        password: ${MYSQL_SERVER_PASSWORD:houyi..}
+#        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+#        filters: stat,wall,slf4j
+#        initial-size: 5
+#        max-active: 100
+#        # 配置一个连接在池中最小生存的时间，单位是毫秒
+#        minEvictableIdleTimeMillis: 300000
+#        max-wait: 60000
+#        min-idle: 5
+#        testWhileIdle: true
+#        testOnBorrow: false
+#        testOnReturn: false
+#        time-between-eviction-runs-millis: 50000
+#        validation-query: select 1
+#        validation-query-timeout: 10
+#      fourth:
+#        # 使用阿里的Druid连接池
+#        driver-class-name: com.mysql.cj.jdbc.Driver
+#        type: com.alibaba.druid.pool.DruidDataSource
+#        enableDrds: true
+#        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+#        # 填写你数据库的url、登录名、密码和数据库名 allowMultiQueries=true nj-cdb-m52p6dj5.sql.tencentcdb.com 63865 !@#$%QWERTasdfg hypt_smp
+#        jdbc-url: jdbc:mysql://159.75.82.245:3306/etc-user-operate?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false
+#        username: ${MYSQL_SERVER_USER:root}
+#        password: ${MYSQL_SERVER_PASSWORD:houyi..}
+#        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+#        filters: stat,wall,slf4j
+#        initial-size: 5
+#        max-active: 100
+#        # 配置一个连接在池中最小生存的时间，单位是毫秒
+#        minEvictableIdleTimeMillis: 300000
+#        max-wait: 60000
+#        min-idle: 5
+#        testWhileIdle: true
+#        testOnBorrow: false
+#        testOnReturn: false
+#        time-between-eviction-runs-millis: 50000
+#        validation-query: select 1
+#        validation-query-timeout: 10
 
 
 common:

src/test/java/SaleTest.java

@@ -15,6 +15,7 @@ import com.qtzl.alterSales.manager.service.byd.vo.BydDashBoardResponse;
 import com.qtzl.alterSales.manager.service.byd.vo.BydPushDataResultRequest;
 import com.qtzl.alterSales.manager.service.wechat.WechatMchService;
 import com.qtzl.alterSales.manager.tools.RedisUtils;
+import com.qtzl.alterSales.manager.vo.AflMchConfigVo;
 import com.qtzl.alterSales.manager.vo.BydOrderVehicleInfoVo;
 import com.qtzl.alterSales.manager.vo.ChoiceBillsPayVo;
 import com.qtzl.alterSales.manager.vo.WechatStatisticsVo;
@@ -60,8 +61,6 @@ public class SaleTest {
     @Resource
     private AflBydExceptionManager aflBydExceptionManager;
     @Resource
-    private BydDashboardBatchSyncTask bydDashboardBatchSyncTask;
-    @Resource
     private BydDashboardResultTask dashboardResultTask;
     @Resource
     private WechatMchService wechatMchService;
@@ -90,14 +89,12 @@ public class SaleTest {
 
     @Test
     public void tt222() {
-        aflMchStatisticsLogService.generateLog(2024);
+        aflPapersDesensitizationTask.desensitizationHandler();
     }
 
     @Test
     public void ttess() throws ServiceHandleException {
-        final List<WechatStatisticsVo> wechatStatisticsVos = wechatMchService.wechatStatistics(20240528, aflMchConfigManager.findBySubMchId("1638682973"));
-        final List<WechatStatisticsVo> wechatStatisticsVos2 = wechatMchService.wechatStatistics(20240529, aflMchConfigManager.findBySubMchId("1638682973"));
-        final List<WechatStatisticsVo> wechatStatisticsVos3 = wechatMchService.wechatStatistics(20240530, aflMchConfigManager.findBySubMchId("1638682973"));
+        final AflMchConfigVo aflMchConfigVo = aflMchConfigManager.findBySubMchId("1638682973");
         System.out.println();
     }