diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index 2635efc937..dc63adc141 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -964,18 +964,18 @@ public class GovOrgServiceImpl implements GovOrgService {
log.warn("【网格活跃度统计】调用OSS上传结果描述文件失败");
} else {
//EPMETV3群机器人
- // String secret = DingDingRobotConstant.V3_ROBOT_SECRET;
- // String url = DingDingRobotConstant.V3_ROBOT_URL;
- String secret = DingDingRobotConstant.YZM_TEST_SECRET;
- String url = DingDingRobotConstant.YZM_TEST_URL;
+ String secret = DingDingRobotConstant.V3_ROBOT_SECRET;
+ String url = DingDingRobotConstant.V3_ROBOT_URL;
+ // String secret = DingDingRobotConstant.YZM_TEST_SECRET;
+ // String url = DingDingRobotConstant.YZM_TEST_URL;
DingTextBriefNessFormDTO dingTalkTextMsg=new DingTextBriefNessFormDTO();
dingTalkTextMsg.setMsgtype("text");
//小雷哥手机号:18660295251,
OapiRobotSendRequest.At at = new OapiRobotSendRequest.At();
- // at.setAtMobiles(Arrays.asList("18660295251"));
- at.setAtMobiles(Arrays.asList("15764229697"));
+ at.setAtMobiles(Arrays.asList("18660295251"));
+ // at.setAtMobiles(Arrays.asList("15764229697"));
at.setIsAtAll(false);
dingTalkTextMsg.setAt(at);
@@ -984,7 +984,7 @@ public class GovOrgServiceImpl implements GovOrgService {
text.setContent("网格活跃度统计: \n" +
"起止时间: " + formDTO.getStartTime().concat(StrConstant.UNDER_LINE).concat(formDTO.getEndTime()) + "\n" +
"文件下载地址: " + uploadResult.getData().getUrl() + "\n"+
- "请查收@15764229697");
+ "请查收@18660295251");
dingTalkTextMsg.setText(text);
HttpClientManager.getInstance().sendDingMsg(JSON.toJSONString(dingTalkTextMsg), url, secret);
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 26f74c4124..891e6f2cf4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -1033,7 +1033,13 @@
AND date_id #{endTime}
- GROUP BY date_id, agency_id
+
+
+ GROUP BY date_id, agency_id
+
+
+ GROUP BY date_id, grid_id
+
ORDER BY date_id ASC
@@ -1041,7 +1047,13 @@
AND date_id =]]> #{startTime}
AND date_id #{endTime}
- GROUP BY date_id, agency_id
+
+
+ GROUP BY date_id, agency_id
+
+
+ GROUP BY date_id, grid_id
+
ORDER BY date_id DESC
diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml
index 9c057ecb24..f1ca66e4fe 100644
--- a/epmet-module/resi-guide/resi-guide-server/pom.xml
+++ b/epmet-module/resi-guide/resi-guide-server/pom.xml
@@ -141,6 +141,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-guide-
+ callerRunsPolicy
+
false
@@ -181,6 +190,15 @@
false
+
+ true
+ 5
+ 8
+ 10
+ 60
+ epmet-guide-
+ callerRunsPolicy
+
false
@@ -221,6 +239,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ epmet-guide-
+ callerRunsPolicy
+
true
@@ -259,6 +286,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ epmet-guide-
+ callerRunsPolicy
+
true
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
index 8084eeeec5..c8bfca6ee6 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
@@ -133,3 +133,14 @@ shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
+
+thread:
+ # 线程池配置
+ threadPool:
+ enableCustomize: @thread.threadPool.enable-customize@
+ corePoolSize: @thread.threadPool.core-pool-size@
+ maxPoolSize: @thread.threadPool.max-pool-size@
+ queueCapacity: @thread.threadPool.queue-capacity@
+ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@
+ threadNamePrefix: @thread.threadPool.thread-name-prefix@
+ rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml
index e1d8cb9996..bffb6788ab 100644
--- a/epmet-module/resi-hall/resi-hall-server/pom.xml
+++ b/epmet-module/resi-hall/resi-hall-server/pom.xml
@@ -105,6 +105,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-hall
+ callerRunsPolicy
+
false
@@ -139,6 +148,15 @@
false
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-hall
+ callerRunsPolicy
+
false
@@ -173,6 +191,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-hall
+ callerRunsPolicy
+
true
@@ -204,6 +231,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-hall
+ callerRunsPolicy
+
true
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
index 33e54c75af..35219270ce 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
@@ -88,3 +88,14 @@ shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
+
+thread:
+ # 线程池配置
+ threadPool:
+ enableCustomize: @thread.threadPool.enable-customize@
+ corePoolSize: @thread.threadPool.core-pool-size@
+ maxPoolSize: @thread.threadPool.max-pool-size@
+ queueCapacity: @thread.threadPool.queue-capacity@
+ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@
+ threadNamePrefix: @thread.threadPool.thread-name-prefix@
+ rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
\ No newline at end of file
diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml
index d5972d3f1e..08c3603b30 100644
--- a/epmet-module/resi-home/resi-home-server/pom.xml
+++ b/epmet-module/resi-home/resi-home-server/pom.xml
@@ -129,6 +129,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-home
+ callerRunsPolicy
+
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -162,6 +171,15 @@
false
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-home
+ callerRunsPolicy
+
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -195,6 +213,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-home
+ callerRunsPolicy
+
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -226,6 +253,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-home
+ callerRunsPolicy
+
https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
index a0fecfc66f..7315ad7080 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
@@ -87,3 +87,14 @@ shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
+
+thread:
+ # 线程池配置
+ threadPool:
+ enableCustomize: @thread.threadPool.enable-customize@
+ corePoolSize: @thread.threadPool.core-pool-size@
+ maxPoolSize: @thread.threadPool.max-pool-size@
+ queueCapacity: @thread.threadPool.queue-capacity@
+ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@
+ threadNamePrefix: @thread.threadPool.thread-name-prefix@
+ rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
\ No newline at end of file
diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml
index ef177cadf2..b2ebcfe1b7 100644
--- a/epmet-module/resi-mine/resi-mine-server/pom.xml
+++ b/epmet-module/resi-mine/resi-mine-server/pom.xml
@@ -148,6 +148,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-mine
+ callerRunsPolicy
+
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -180,6 +189,15 @@
false
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-mine
+ callerRunsPolicy
+
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -212,6 +230,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-mine
+ callerRunsPolicy
+
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -242,6 +269,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-mine
+ callerRunsPolicy
+
https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
index 68fb8924c1..60f5366ff8 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
@@ -111,3 +111,14 @@ shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
+
+thread:
+ # 线程池配置
+ threadPool:
+ enableCustomize: @thread.threadPool.enable-customize@
+ corePoolSize: @thread.threadPool.core-pool-size@
+ maxPoolSize: @thread.threadPool.max-pool-size@
+ queueCapacity: @thread.threadPool.queue-capacity@
+ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@
+ threadNamePrefix: @thread.threadPool.thread-name-prefix@
+ rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 462586a0b6..912fe79e30 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -64,12 +64,6 @@
2.0.0
compile
-
- com.epmet
- epmet-user-client
- 2.0.0
- compile
-
info.debatty
java-string-similarity
@@ -159,6 +153,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-partymember-
+ callerRunsPolicy
+
false
@@ -200,6 +203,15 @@
false
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-partymember-
+ callerRunsPolicy
+
false
@@ -241,6 +253,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-partymember-
+ callerRunsPolicy
+
true
@@ -280,6 +301,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-partymember-
+ callerRunsPolicy
+
true
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
index 211b221914..ee185fa822 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
@@ -132,3 +132,14 @@ shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
+
+thread:
+ # 线程池配置
+ threadPool:
+ enableCustomize: @thread.threadPool.enable-customize@
+ corePoolSize: @thread.threadPool.core-pool-size@
+ maxPoolSize: @thread.threadPool.max-pool-size@
+ queueCapacity: @thread.threadPool.queue-capacity@
+ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@
+ threadNamePrefix: @thread.threadPool.thread-name-prefix@
+ rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
\ No newline at end of file
diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml
index a3dd4affa4..ae4858bceb 100644
--- a/epmet-module/resi-voice/resi-voice-server/pom.xml
+++ b/epmet-module/resi-voice/resi-voice-server/pom.xml
@@ -105,6 +105,14 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-voice
+ callerRunsPolicy
@@ -139,6 +147,15 @@
false
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-voice
+ callerRunsPolicy
+
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -172,6 +189,15 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-voice
+ callerRunsPolicy
+
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -206,6 +232,14 @@
true
+
+ true
+ 5
+ 8
+ 10
+ 60
+ resi-voice
+ callerRunsPolicy
diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
index 156a3bf5d7..dc2eaa3898 100644
--- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
@@ -79,3 +79,14 @@ shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间,超过30秒,发出告警
+
+thread:
+ # 线程池配置
+ threadPool:
+ enableCustomize: @thread.threadPool.enable-customize@
+ corePoolSize: @thread.threadPool.core-pool-size@
+ maxPoolSize: @thread.threadPool.max-pool-size@
+ queueCapacity: @thread.threadPool.queue-capacity@
+ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@
+ threadNamePrefix: @thread.threadPool.thread-name-prefix@
+ rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
\ No newline at end of file