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 @@
                 <if test='endTime != "" and endTime != null '>
                     AND date_id <![CDATA[<=]]> #{endTime}
                 </if>
-                GROUP BY date_id, agency_id
+                <!-- 平阴的三个街道的数据在表里同一天会存在两条，一条是上报的一条是小程序统计的，所以查询时需要sum,此处就得分组 -->
+                <if test='dataType == "agency"'>
+                    GROUP BY date_id, agency_id
+                </if>
+                <if test='dataType == "grid"'>
+                    GROUP BY date_id, grid_id
+                </if>
                 ORDER BY date_id ASC
             </if>
             <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
@@ -1041,7 +1047,13 @@
                     AND date_id <![CDATA[>=]]> #{startTime}
                 </if>
                 AND date_id <![CDATA[<=]]> #{endTime}
-                GROUP BY date_id, agency_id
+                <!-- 平阴的三个街道的数据在表里同一天会存在两条，一条是上报的一条是小程序统计的，所以查询时需要sum,此处就得分组 -->
+                <if test='dataType == "agency"'>
+                    GROUP BY date_id, agency_id
+                </if>
+                <if test='dataType == "grid"'>
+                    GROUP BY date_id, grid_id
+                </if>
                 ORDER BY date_id DESC
             </if>
             <choose>
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java
index 133f98ab11..c714bd77e1 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java
@@ -102,10 +102,19 @@ public interface OperCustomizeOpenFeignClient {
     Result<List<IcResiCategoryStatsConfigDTO>> getCategoryList(@RequestBody IcResiCategoryStatsConfigDTO dto);
 
 
-
+    /**
+     * 获取居民类别配置表ic_resi_category_stats_config，根据token里的客户id查询，可根据状态筛选：显示：show；隐藏：hidden；
+     * @param formDTO
+     * @return
+     */
     @PostMapping("/oper/customize/resicategorystatsconfig/resicategorystatslistshowd")
     Result<List<IcResiCategoryStatsConfigDTO>> resiCategoryStatsListShowd(@RequestBody IcResiCategoryStatsConfigFormDTO formDTO);
 
+    /**
+     * 查询ic_resi_category_warn_config,返回预警的类别
+     * @param customerId
+     * @return
+     */
     @PostMapping("/oper/customize/resicategorystatsconfig/resicategorywarnlist")
     Result<List<IcResiCategoryWarnConfigDTO>> resiCategoryWarnList(@RequestParam String customerId);
 
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java
index f43e75bf97..3c2004e714 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java
@@ -128,6 +128,12 @@ public class ResiCategoryStatsConfigController {
         return new Result<IcResiCategoryStatsConfigResultDTO>().ok(resiCategoryStatsConfigService.info(formDTO.getId(),tokenDTO.getCustomerId()));
     }
 
+    /**
+     * 获取居民类别配置表ic_resi_category_stats_config，根据token里的客户id查询，可根据状态筛选：显示：show；隐藏：hidden；
+     * @param tokenDTO
+     * @param formDTO
+     * @return
+     */
     @PostMapping("resicategorystatslistshowd")
     public Result<List<IcResiCategoryStatsConfigDTO>> resiCategoryStatsListShowd(@LoginUser TokenDto tokenDTO,@RequestBody IcResiCategoryStatsConfigFormDTO formDTO){
         //获取预警配置列表
@@ -145,6 +151,11 @@ public class ResiCategoryStatsConfigController {
         return new Result<List<IcResiCategoryStatsConfigDTO>>().ok(ConvertUtils.sourceToTarget(statsConfigEntityList, IcResiCategoryStatsConfigDTO.class));
     }
 
+    /**
+     * 查询ic_resi_category_warn_config,返回预警的类别
+     * @param customerId
+     * @return
+     */
     @PostMapping("resicategorywarnlist")
     public Result<List<IcResiCategoryWarnConfigDTO>> resiCategoryWarnList(@RequestParam String customerId){
         //获取预警配置列表
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 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-guide-</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <spring.flyway.enabled>false</spring.flyway.enabled>
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
@@ -181,6 +190,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>epmet-guide-</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <spring.flyway.enabled>false</spring.flyway.enabled>
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
@@ -221,6 +239,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>epmet-guide-</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <spring.flyway.enabled>true</spring.flyway.enabled>
                 <!--测试钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
@@ -259,6 +286,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>epmet-guide-</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <spring.flyway.enabled>true</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
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 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-hall</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <spring.flyway.enabled>false</spring.flyway.enabled>
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
@@ -139,6 +148,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-hall</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <spring.flyway.enabled>false</spring.flyway.enabled>
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
@@ -173,6 +191,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-hall</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <spring.flyway.enabled>true</spring.flyway.enabled>
                 <!--测试钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
@@ -204,6 +231,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-hall</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <spring.flyway.enabled>true</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
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 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-home</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
                     https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -162,6 +171,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-home</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
                     https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -195,6 +213,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-home</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <!--测试钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
                     https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -226,6 +253,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-home</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
                     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 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-mine</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
                     https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -180,6 +189,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-mine</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
                     https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -212,6 +230,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-mine</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <!--测试钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
                     https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -242,6 +269,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-mine</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
                     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..bae2ec09fb 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -17,6 +17,11 @@
             <artifactId>resi-partymember-client</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>
@@ -64,12 +69,6 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>epmet-user-client</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>info.debatty</groupId>
             <artifactId>java-string-similarity</artifactId>
@@ -159,6 +158,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-partymember-</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--钉钉 机器人地址-->
@@ -200,6 +208,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-partymember-</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--钉钉 机器人地址-->
@@ -241,6 +258,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-partymember-</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <spring.flyway.enabled>true</spring.flyway.enabled>
 
                 <!--测试钉钉 机器人地址-->
@@ -280,6 +306,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-partymember-</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <spring.flyway.enabled>true</spring.flyway.enabled>
 
 
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 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-voice</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
@@ -139,6 +147,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>false</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-voice</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
                     https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -172,6 +189,15 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-voice</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+
                 <!--测试钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
                     https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
@@ -206,6 +232,14 @@
                 <!--是否开启服务列表变更监听-->
                 <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
 
+                <!--线程池-->
+                <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>
+                <thread.threadPool.core-pool-size>5</thread.threadPool.core-pool-size>
+                <thread.threadPool.max-pool-size>8</thread.threadPool.max-pool-size>
+                <thread.threadPool.queue-capacity>10</thread.threadPool.queue-capacity>
+                <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
+                <thread.threadPool.thread-name-prefix>resi-voice</thread.threadPool.thread-name-prefix>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>
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
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonWarnRightListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonWarnRightListFormDTO.java
index 977390e31a..9be92d4233 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonWarnRightListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonWarnRightListFormDTO.java
@@ -22,4 +22,6 @@ public class PersonWarnRightListFormDTO implements Serializable {
 
     @NotNull(message = "pageSize不能为空",groups = PersonWarnRightListForm.class)
     private Integer pageSize;
+
+    private String categoryCode;
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcStatsResiWarnBuildingResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcStatsResiWarnBuildingResultDTO.java
index 3d4253f721..f4c317274a 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcStatsResiWarnBuildingResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcStatsResiWarnBuildingResultDTO.java
@@ -20,7 +20,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 
@@ -38,21 +37,52 @@ public class IcStatsResiWarnBuildingResultDTO implements Serializable {
 
     /**
      * 预警配置ID
+     * ic_resi_category_warn_config.id
      */
 	private String configId;
 
+    /**
+     * ic_resi_category_warn_config.label
+     * 类别名
+     */
 	private String label;
 
+    /**
+     * 排序
+     */
 	private Integer sort;
+
+    /**
+     * 等级1阈值
+     */
 	private Integer level1;
     private Integer levelCount1;
+
+    /**
+     * 等级2阈值
+     */
     private Integer level2;
     private Integer levelCount2;
+
+    /**
+     * 等级3阈值
+     */
     private Integer level3;
     private Integer levelCount3;
 
+    /**
+     * 管理平台分类图标
+     */
     private String managementIcon;
+
+    /**
+     * 数据平台分类图标
+     */
     private String dataIcon;
+
+    /**
+     * 房屋显示分类图标
+     */
     private String houseShowIcon;
     private Integer count;
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonWarnRightListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonWarnRightListResultDTO.java
index c98b26cbec..a2739c6857 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonWarnRightListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonWarnRightListResultDTO.java
@@ -35,6 +35,9 @@ public class PersonWarnRightListResultDTO implements Serializable {
          */
         private List<String> type;
 
+        @JsonIgnore
+        private String sortString;
+
         /**
          * 所属网格
          */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java
index 33855a2b2c..3d18050f66 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java
@@ -17,19 +17,15 @@
 
 package com.epmet.controller;
 
-import com.epmet.common.token.annotation.Login;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.CategoryCountListFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
 import com.epmet.dto.form.StatsResiWarnCountFormDTO;
 import com.epmet.dto.form.StatsResiWarnFormDTO;
-import com.epmet.dto.result.CategoryCountListResultDTO;
 import com.epmet.dto.result.IcStatsResiResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
-import com.epmet.dto.result.IcStatsResiWarnUserResultDTO;
 import com.epmet.service.IcStatsResiWarnService;
 import com.epmet.service.StatsResiWarnService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,6 +76,12 @@ public class StatsResiWarnController {
         return new Result<List<IcStatsResiResultDTO>>().ok(statsResiWarnService.list2(formDTO));
     }
 
+    /**
+     * 可视化分析-人员预警，各类别楼栋数量展示
+     * @param tokenDto
+     * @param formDTO 只有agencyId
+     * @return
+     */
     @PostMapping("buildingwarnlist")
     public Result buildingWarnList(@LoginUser TokenDto tokenDto,@RequestBody StatsResiWarnFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, StatsResiWarnFormDTO.ListSelectedBuilding.class);
@@ -89,6 +91,13 @@ public class StatsResiWarnController {
         return new Result().ok(icStatsResiWarnBuildingResultDTOS);
 
     }
+
+    /**
+     * 可视化分析-人员预警，楼栋列表展示
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
     @PostMapping("userwarnlist")
     public Result userWarnList(@LoginUser TokenDto tokenDto,@RequestBody StatsResiWarnFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, StatsResiWarnFormDTO.ListSelectedUser.class);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java
index f0c4e5f5f5..7c5477b61b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java
@@ -17,12 +17,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.form.CategoryCountListFormDTO;
 import com.epmet.dto.form.StatsResiListFormDTO;
-import com.epmet.dto.result.CategoryCountListResultDTO;
 import com.epmet.dto.result.IcStatsResiResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
-import com.epmet.dto.result.IcStatsResiWarnUserResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -35,8 +32,23 @@ import java.util.Map;
  */
 public interface StatsResiWarnService{
 
+    /**
+     * 可视化分析-人员预警，各类别楼栋数量展示
+     * @param customerId
+     * @param agencyID
+     * @return
+     */
     List<IcStatsResiWarnBuildingResultDTO> buildingwWarnList(String customerId,String agencyID);
 
+    /**
+     * 可视化分析-人员预警，楼栋列表展示
+     * @param customerId
+     * @param configId
+     * @param buildingIdList
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
     Map<String,Object> userWarnList(String customerId, String configId, List<String> buildingIdList, Integer pageNo, Integer pageSize);
 
     List<IcStatsResiResultDTO> list(String customerId,String id, String level);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index 302d3d7b01..59be4a9fb4 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -417,7 +417,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                                        String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel,
                                        String currUserAgencyPids, String currentUserId, String tableName) {
 
-        this.printLog("persistIcResiBaseInfo");
+        //this.printLog("persistIcResiBaseInfo");
 
         // 遍历每一行，将行内容转化为
         for (Map<Integer, String> row : dataRows) {
@@ -1002,7 +1002,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         List<OptionResultDTO> options = null;
 
         log.info("optionsUrl:{}, currUserAgencyId:{}", pureUri, currUserAgencyId);
-        this.printLog("listRemoteOptions");
+        //this.printLog("listRemoteOptions");
         switch (pureUri) {
             case "/epmetuser/icresidemanddict/demandoption":
                 options = getResultDataOrThrowsException(epmetUserOpenFeignClient.getDemandOptions(), ServiceConstant.EPMET_USER_SERVER,
@@ -1043,7 +1043,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 }
                 nform.setGridId(gridId);
 
-                this.printLog("listRemoteOptions#neighborhoodoption");
+                //this.printLog("listRemoteOptions#neighborhoodoption");
                 log.info("neighborhoodoption:{},{}", currUserAgencyId, gridId);
 
                 options = getResultDataOrThrowsException(govOrgOpenFeignClient.getNeighborHoodOptions(nform), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index be62667c51..341932bd52 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -40,10 +40,8 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.commons.tools.utils.HttpContextUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.IcPlatformConstant;
 import com.epmet.constant.IcResiUserConstant;
@@ -73,7 +71,6 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.Date;
@@ -988,7 +985,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
             }
         } catch (Exception ex) {
-            log.warn("listRemoteOptions url:{}", e.getOptionSourceValue());
+            log.error("listRemoteOptions url:{}", e.getOptionSourceValue());
         }
     }
 
@@ -1186,8 +1183,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         if (CollectionUtils.isEmpty(configListResult.getData())){
             return result;
         }
-        List<CustomerCategoryShowAndWarnListResultDTO> configList = configListResult.getData();
-        PageInfo<Map<String, Object>> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectResiUsers(configList.stream().map(m -> m.getColumnName()).collect(Collectors.toList()), staffInfo.getAgencyId()));
+        List<CustomerCategoryShowAndWarnListResultDTO> configListOrigin = configListResult.getData();
+        List<CustomerCategoryShowAndWarnListResultDTO> configList = new ArrayList<>();
+        if (StringUtils.isNotBlank(formDTO.getCategoryCode())){
+            for (CustomerCategoryShowAndWarnListResultDTO c : configListOrigin) {
+                if (c.getColumnName().equals(formDTO.getCategoryCode())){
+                    configList.add(c);
+                }
+            }
+        }else {
+            configList = configListOrigin;
+        }
+        List<CustomerCategoryShowAndWarnListResultDTO> finalConfigList = configList;
+        PageInfo<Map<String, Object>> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectResiUsers(finalConfigList.stream().map(m -> m.getColumnName()).collect(Collectors.toList()), staffInfo.getAgencyId()));
         List<Map<String, Object>> list = pageInfo.getList();
         if (CollectionUtils.isEmpty(list)) {
             return result;
@@ -1200,7 +1208,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
         List<HouseInfoDTO> houseInfos = houseInfosResult.getData();
         userList.forEach(u -> houseInfos.stream().filter(h -> h.getHomeId().equals(u.getHomeId())).forEach(h -> u.setFamily(h.getAllName())));
-        result.setList(userList);
+        // 类型+网格+家庭 排序
+        userList.forEach(u -> {
+            String types = u.getType().stream().map(String::valueOf).collect(Collectors.joining("、"));
+            String s = types + u.getGridName() + u.getFamily();
+            u.setSortString(s);
+        });
+        List<PersonWarnRightListResultDTO.PersonWarnRightList> finalResult = userList.stream().sorted(Comparator.comparing(PersonWarnRightListResultDTO.PersonWarnRightList::getSortString)).collect(Collectors.toList());
+        result.setList(finalResult);
         return result;
     }
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
index d9662fdc8b..caca478526 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
@@ -134,6 +134,14 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
                 } else {
                     resultDto.setGridName(StrConstant.EPMETY_STR);
                 }
+                //类别变动添加 新增/减少后缀
+                if ("category".equals(resultDto.getType())){
+                    String tempSuffix = "减少";
+                    if (resultDto.getValue().equals(NumConstant.ONE)){
+                        tempSuffix = "增加";
+                    }
+                    resultDto.setTypeName(resultDto.getTypeName().concat(tempSuffix));
+                }
             });
         }
         return new PageData<>(list, pageInfo.getTotal());
@@ -265,4 +273,4 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
         icUserChangeDetailedService.insertBatch(detailedList);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java
index c6b33e482b..789b189016 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java
@@ -50,6 +50,12 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
     @Resource
     private IcResiUserDao icResiUserDao;
 
+    /**
+     * 可视化分析-人员预警，各类别楼栋数量展示
+     * @param customerId
+     * @param agencyID
+     * @return
+     */
     @Override
     public List<IcStatsResiWarnBuildingResultDTO> buildingwWarnList(String customerId,String agencyID) {
         List<IcStatsResiWarnBuildingResultDTO> result = new ArrayList<>();