远通数据源接入机制:更改修复bug, 更改数据源配置位置

sql.properties

@@ -3,6 +3,12 @@ spring.datasource.data.username=postgres
 spring.datasource.data.password=kpr.23417.postgres
 spring.datasource.data.driver-class-name=org.postgis.DriverWrapper
 
+#pgsql 自来水水量预测数据库源
+spring.datasource.db2.jdbc-url=jdbc:postgresql_postGIS://119.96.165.176:5432/water_volume_prediction?useSSL=false&useAffectedRows=false&allowMultiQueries=true
+spring.datasource.db2.username=postgres
+spring.datasource.db2.password=kpr.23417.postgres
+spring.datasource.db2.driver-class-name=org.postgis.DriverWrapper
+
 
 spring.datasource.data2.jdbc-url=jdbc:postgresql://119.96.165.176:5432/water_smart_central?useSSL=false&useAffectedRows=false&allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8
 spring.datasource.data2.username=postgres

src/main/java/com/shkpr/service/aimodelpower/bizmgr/KprAimTapWaterBizFun.java

@@ -48,7 +48,7 @@ public class KprAimTapWaterBizFun {
             //TODO 按照组织机构分组
             Map<Object, List<Map<String, Object>>> groupedData =
                     configList.stream().collect(Collectors.groupingBy(item -> item.get("org_name")));
-            final CountDownLatch latch = new CountDownLatch(configList.size());
+            final CountDownLatch latch = new CountDownLatch(groupedData.keySet().size());
             for (Object key:groupedData.keySet()){
                 try {
                     ThreadTaskMgr.runTask(new TraceRunnable(TraceLogMgr.getTraceId()) {
@@ -101,7 +101,6 @@ public class KprAimTapWaterBizFun {
                                                 if (value == null) {
                                                     value = 0.00;
                                                 }
-                                                System.out.println();
                                                 value += Math.abs(lastValue - firstValue);
                                             }
                                         }

src/main/java/com/shkpr/service/aimodelpower/configuration/ChildPgDataSourceConfig.java

@@ -13,6 +13,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 
@@ -28,6 +29,7 @@ import javax.sql.DataSource;
  **/
 @Configuration
 @MapperScan(basePackages = "com.shkpr.service.aimodelpower.dbdao.mapper.childpg",sqlSessionFactoryRef = "db2SqlSessionFactory")
+@PropertySource(value = "file:${global.sql.config.path}", ignoreResourceNotFound = true, encoding="utf-8")
 public class ChildPgDataSourceConfig {
 
     @Value("${spring.datasource.db2.driver-class-name:}")

src/main/java/com/shkpr/service/aimodelpower/globalmgr/ScheduleTaskMgr.java

@@ -104,6 +104,21 @@ public class ScheduleTaskMgr {
         KprAimTapWaterBizFun.checkRecordData();
     }
 
+    //TODO 启动时执行 测试方法
+    @PostConstruct
+    public void initTest(){
+        Timer timer = new Timer();
+        // 创建定时器任务
+        TimerTask timerTask = new TimerTask() {
+            @Override
+            public void run() {
+                KprAimTapWaterBizFun.checkRecordAllData();
+                KprAimTapWaterBizFun.checkRecordData();
+            }
+        };
+        timer.schedule(timerTask, 5000); // 10秒后执行一次
+    }
+
 
     //TODO 启动时执行一次
     @PostConstruct

src/main/resources/application.properties

@@ -73,12 +73,6 @@ spring.datasource.primary.username=v_shizilaishui
 spring.datasource.primary.password=ShiZiLaiShui@0811
 spring.datasource.primary.driver-class-name=oracle.jdbc.driver.OracleDriver
 
-#pgsql 自来水水量预测数据库源
-spring.datasource.db2.jdbc-url=jdbc:postgresql_postGIS://119.96.165.176:5432/water_volume_prediction?useSSL=false&useAffectedRows=false&allowMultiQueries=true
-spring.datasource.db2.username=postgres
-spring.datasource.db2.password=kpr.23417.postgres
-spring.datasource.db2.driver-class-name=org.postgis.DriverWrapper
-
 #开启mybatis内部调试日志输出
 #logging.level.com.sqlmybatis.test.mapper=debug