优化

slibra-admin/src/main/java/com/slibra/web/controller/business/HandleDataController.java

@@ -252,47 +252,65 @@ public class HandleDataController extends BaseController
     }
 
     @GetMapping("/dateUpdateCL")
-    public void dateUpdateCL() {
+    public String dateUpdateCL() {
         String fileName = "除磷加药瞬时流量";
         //输入目录
-        ExcelReader reader = ExcelUtil.getReader("C:\\Users\\10109\\Desktop\\parse-data\\AdvertiseGen\\" + fileName + ".xls");
+        ExcelReader reader = ExcelUtil.getReader("C:\\Users\\10109\\Desktop\\新程序\\" + fileName + ".xls");
         //解析数据
         List<List<Object>> readAll = reader.read();
         if(!CollectionUtils.isEmpty(readAll)){
             for (List<Object> objects : readAll) {
-                String time = objects.get(0) + " " + objects.get(1).toString().substring(0, 5);
+                String time = "20" + objects.get(0) + " " + objects.get(1).toString().substring(0, 5);
                 System.out.println("time = " + time);
                 TXinyiIndustry uniqueTXinyiIndustry = this.xinyiIndustryMapper.getUniqueTXinyiIndustry(time);
                 if(!Objects.isNull(uniqueTXinyiIndustry)){
-                    BigDecimal CLJYSSLL = Objects.isNull(objects.get(2)) ? null : (BigDecimal) objects.get(2);
+                    System.out.println(objects.get(2));
+                    BigDecimal CLJYSSLL = Objects.isNull(objects.get(2)) ? null : new BigDecimal(String.valueOf(objects.get(2)));
                     uniqueTXinyiIndustry.setCLJYSSLL(CLJYSSLL);
                     this.xinyiIndustryMapper.updateTXinyiIndustry(uniqueTXinyiIndustry);
                 }
             }
         }
+        return "ok";
     }
 
 
     @GetMapping("/dateUpdateSJTY")
-    public void dateUpdateSJTY() {
+    public String dateUpdateSJTY() {
         String fileName = "信义污水厂实际碳源加药量";
         //输入目录
-        ExcelReader reader = ExcelUtil.getReader("C:\\Users\\10109\\Desktop\\parse-data\\AdvertiseGen\\" + fileName + ".xls");
+        ExcelReader reader = ExcelUtil.getReader("C:\\Users\\10109\\Desktop\\新程序\\" + fileName + ".xls");
         //解析数据
         List<List<Object>> readAll = reader.read();
         if(!CollectionUtils.isEmpty(readAll)){
+            int i = 0;
             for (List<Object> objects : readAll) {
-                cn.hutool.core.date.DateTime time = (DateTime) objects.get(0);
-                System.out.println("time = " + time);
-                String format = DateUtil.format(time, DateUtils.YYYYMMDDHHMM_TS);
-                System.out.println("format = " + format);
+                String format = "";
+                if(objects.get(0) instanceof String){
+                    System.out.println("----------是字符串类型的");
+                    String time = ((String) objects.get(0));
+                    System.out.println("time = " + time);
+                    format =  time.replaceAll("-", "/").substring(0, 16);
+                }else if (objects.get(0) instanceof cn.hutool.core.date.DateTime){
+                    System.out.println("++++++++++是日期类型的");
+                    cn.hutool.core.date.DateTime time = (DateTime) objects.get(0);
+                    System.out.println("time = " + time);
+                    format = DateUtil.format(time, DateUtils.YYYYMMDDHHMM_TS);
+                    System.out.println("format = " + format);
+                }else {
+                    System.out.println(JSON.toJSONString(objects));
+                    format = "";
+                    i++;
+                }
                 TXinyiIndustry uniqueTXinyiIndustry = this.xinyiIndustryMapper.getUniqueTXinyiIndustry(format);
                 if(!Objects.isNull(uniqueTXinyiIndustry)){
-                    BigDecimal SJTYJLY = Objects.isNull(objects.get(1)) ? null : (BigDecimal) objects.get(1);
+                    BigDecimal SJTYJLY = Objects.isNull(objects.get(1)) ? null : new BigDecimal(String.valueOf(objects.get(1)));
                     uniqueTXinyiIndustry.setSJTYJLY(SJTYJLY);
                     this.xinyiIndustryMapper.updateTXinyiIndustry(uniqueTXinyiIndustry);
                 }
             }
+            System.out.println("i =" + i);
         }
+        return "ok";
     }
 }

slibra-admin/src/main/resources/application-local.yml

@@ -0,0 +1,106 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: root
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+                url: jdbc:sqlserver://10.0.3.53:1433;SelectMethod=Cursor;DatabaseName=信义;
+                username: hongshan
+                password: hongshan
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: slibra
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+
+
+
+application:
+    ali-cloud:
+        enable-sms: true
+        access-key-id: LTAI5tMYjV29Hy1XKn3d79YD
+        access-key-secret: 48we5KZdx9Bu2OiJ9hmXhQTf2aCut0
+        sign-name: 伏羲碳惠交易平台
+        templateCooperation: SMS_264860508
+        templateCodeMessage: SMS_461080515
+        templateSysRegistPassed: SMS_461065541
+        templateRegistPassed: SMS_461025520
+        templateRegistUnpassed: SMS_460935564
+        templateAccountFreezed: SMS_264190885
+        templateAccountUnfreezed: SMS_264030916
+        templateAccountReset: SMS_264030920
+        templateRegistBuyer: SMS_462425424
+
+    plat-bank-account:
+        user-id: 1
+        account-name: 碳交易平台银行账号
+        account-number: 1234567891234567
+        issuing-bank: 平台开会行
+        inter-bank-number: 银联号
+        issuing-address: 开户行地址
+
+    tempPath: ./trade/tmp/
+    uploadPath: ./upload/
+    ecspUploadPath: ../clibra/upload/
+    wechatPay:
+        merchantId: 1649012850
+        appId: wx4bc491881ec58241
+        privateKeyPath: E:\\apiclient_key.pem #todo 为什么这里配置./wechatPay/apiclient_key.pem 不可以用呢
+        merchantSerialNumber: 509C23FE88EBBBA28BF0F9D9FA477FF93F9EDD24
+        apiV3key: 5ugirU2woc4BQdGZjJlQX8GHmY4u8685
+
+
+oss:
+    qiniu:
+        url: https://static.fuxicarbon.com #域名
+        accessKey: z7EU9DhXbF9Y0J462Qmo8a8HvCOu5KUhR3PiGN-9 #
+        secretKey: t6LGwyfl4gFbckQtyk2QUYW1162u5e7oZh9Ixsnd #
+        bucketName: fuxicarbon  #空间名

slibra-admin/src/main/resources/application.yml

@@ -54,7 +54,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: dev
+    active: local
   # 文件上传
   servlet:
     multipart:

slibra-system/src/main/resources/mapper/business/TXinyiIndustryMapper.xml

@@ -287,7 +287,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLJYSSLL != null">CLJYSSLL = #{CLJYSSLL},</if>
             <if test="createdTime != null">CREATED_TIME = #{createdTime},</if>
         </trim>
-        ,revision = revision + 1
         where ID = #{ID}
     </update>