九小场所接口增加返参；居民信息变动触发mq接入预警统计重新计算方法

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());
     }

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;
 }

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)));