Merge branch '20210223' of http://114.135.61.188:53000/UIMS/Code into 20210223

sms_water/src/main/java/com/huaxu/service/AppDataService.java

@@ -64,7 +64,7 @@ public class AppDataService {
                 break;
             case "售水":
                 appSmsDataDto.setYieldWaterUsage(monitorDataReportService.getAmountCount(null, null, "水厂", 3, 2).divide(BigDecimal.valueOf(10000)).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue());
-                appSmsDataDto.setWaterUsage(monitorDataReportService.getUseAmount(null, 1).divide(BigDecimal.valueOf(10000),3,BigDecimal.ROUND_HALF_UP).doubleValue());
+                appSmsDataDto.setWaterUsage(monitorDataReportService.getUseAmount(null, 1).setScale(3,BigDecimal.ROUND_HALF_UP).doubleValue());
                 double amount = appSmsDataDto.getYieldWaterUsage() - appSmsDataDto.getWaterUsage();
                 if (appSmsDataDto.getYieldWaterUsage() != null && appSmsDataDto.getYieldWaterUsage() != 0d) {
                     appSmsDataDto.setWaterFeeRecoveryRate(BigDecimal.valueOf(amount).divide(BigDecimal.valueOf(appSmsDataDto.getYieldWaterUsage()), 3, BigDecimal.ROUND_HALF_UP).doubleValue() * 100);

sms_water/src/main/resources/application-dev.properties

@@ -161,7 +161,7 @@ aysnc.pool.max-size=200
 #空闲线程保留时间
 aysnc.pool.keep-alive=200
 #队列容量
-aysnc.queue-capacity=100
+aysnc.queue-capacity=100000
 #线程名称前缀
 aysnc.thread-name-prefix=aysnc-thread-
 

sms_water/src/main/resources/application-prd.properties

@@ -157,7 +157,7 @@ aysnc.pool.max-size=200
 #空闲线程保留时间
 aysnc.pool.keep-alive=200
 #队列容量
-aysnc.queue-capacity=100
+aysnc.queue-capacity=100000
 #线程名称前缀
 aysnc.thread-name-prefix=aysnc-thread-
 

sms_water/src/main/resources/application-sit.properties

@@ -159,6 +159,6 @@ aysnc.pool.max-size=200
 #空闲线程保留时间
 aysnc.pool.keep-alive=200
 #队列容量
-aysnc.queue-capacity=100
+aysnc.queue-capacity=100000
 #线程名称前缀
 aysnc.thread-name-prefix=aysnc-thread-