From 80f02934507e44051e6e928ff35849e32b66c0b4 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 17 Nov 2021 17:08:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82=EF=BC=9B=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E4=BF=A1=E6=81=AF=E5=8F=98=E5=8A=A8=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?mq=E6=8E=A5=E5=85=A5=E9=A2=84=E8=AD=A6=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/SysDictDataServiceImpl.java   | 1 +
 .../com/epmet/commons/tools/dto/result/OptionResultDTO.java   | 1 +
 .../java/com/epmet/mq/listener/ICWarnStatsEventListener.java  | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java
index e1c5e266f3..aa62b9b624 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java
@@ -107,6 +107,7 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
             OptionResultDTO dto = new OptionResultDTO();
             dto.setValue(item.getDictValue());
             dto.setLabel(item.getDictLabel());
+            dto.setSysDictDataId(item.getId().toString());
             return dto;
         }).collect(Collectors.toList());
     }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
index 30c786a539..158b59fb55 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
@@ -15,5 +15,6 @@ public class OptionResultDTO implements Serializable {
     private static final long serialVersionUID = 8618231166600518980L;
     private String label;
     private String value;
+    private String sysDictDataId;
     private List<OptionResultDTO> children;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java
index 905f804351..c7462dbc07 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java
@@ -9,6 +9,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.service.StatsResiWarnService;
 import org.apache.commons.lang.StringUtils;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
@@ -65,9 +66,8 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently {
             distributedLock = SpringContextUtils.getBean(DistributedLock.class);
             lock = distributedLock.getLock(String.format("lock:ic_warn_stats:%s", obj.getCustomerId()),
                     30L, 30L, TimeUnit.SECONDS);
-            System.out.println("嘻嘻哈哈哈乐乐呵呵-----------");
             //待执行方法
-            //SpringContextUtils.getBean(BaseGridInfoService.class).getAgencyBaseInfo(obj);
+            SpringContextUtils.getBean(StatsResiWarnService.class).resiWarnByOne(obj.getCustomerId(), obj.getIcResiUser());
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
             logger.error("【开放数据事件监听器】-客户居民信息变动MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e)));