自来水预测数据接口 增加预测数据当前月自添加机制

sql.properties

@@ -4,14 +4,14 @@ 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.db2.jdbc-url=jdbc:postgresql_postGIS://10.101.5.50:5432/water_volume_prediction?useSSL=false&useAffectedRows=false&allowMultiQueries=true
+#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=ygt.23417.postgres
+#spring.datasource.db2.password=kpr.23417.postgres
 #spring.datasource.db2.driver-class-name=org.postgis.DriverWrapper
+spring.datasource.db2.jdbc-url=jdbc:postgresql_postGIS://10.101.5.50:5432/water_volume_prediction?useSSL=false&useAffectedRows=false&allowMultiQueries=true
+spring.datasource.db2.username=postgres
+spring.datasource.db2.password=ygt.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

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

@@ -202,7 +202,7 @@ public class KprAimWaterCollecationBizFun {
                 model.setDataList(dataMap);
                 //TODO 查询相应方案数据
                 List<Map<String,Object>> drawalsList = getWaterTapWaterApi().getTbMWaterwithdrawalspump(false,
-                        20,0," AND orgId = '"+key.toString()+"'");
+                        20,0," AND \"orgId\" = '"+key.toString()+"'");
                 model.setDrawalsList(drawalsList);
                 inPumpModels.add(model);
             }
@@ -278,7 +278,7 @@ public class KprAimWaterCollecationBizFun {
                 model.setDataList(dataMap);
                 //TODO 查询相应方案数据
                 List<Map<String,Object>> drawalsList = getWaterTapWaterApi().getTbMWatersupplypump(false,
-                        20,0," AND orgId = '"+key.toString()+"'");
+                        20,0," AND \"orgId\" = '"+key.toString()+"'");
                 model.setDrawalsList(drawalsList);
                 inPumpModels.add(model);
             }