mq事件DTO名字调整

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/IcWarnStatsMQMsg.java → epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/IcResiUserAddMQMsg.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
  * @author sun
  */
 @Data
-public class IcWarnStatsMQMsg implements Serializable {
+public class IcResiUserAddMQMsg implements Serializable {
 
     //客户Id
     private String customerId;

epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java

@@ -2,7 +2,7 @@ package com.epmet.mq.listener;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.rocketmq.constants.MQUserPropertys;
-import com.epmet.commons.rocketmq.messages.IcWarnStatsMQMsg;
+import com.epmet.commons.rocketmq.messages.IcResiUserAddMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
@@ -57,7 +57,7 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently {
         String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL);
 
         logger.info("【开放数据事件监听器】-居民信息变动-收到消息内容:{},操作:{}", msg, tags);
-        IcWarnStatsMQMsg obj = JSON.parseObject(msg, IcWarnStatsMQMsg.class);
+        IcResiUserAddMQMsg obj = JSON.parseObject(msg, IcResiUserAddMQMsg.class);
 
         DistributedLock distributedLock = null;
         RLock lock = null;

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -17,44 +17,37 @@
 
 package com.epmet.service.impl;
 
-import com.alibaba.excel.EasyExcelFactory;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.rocketmq.messages.IcWarnStatsMQMsg;
+import com.epmet.commons.rocketmq.messages.IcResiUserAddMQMsg;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
-import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.enums.GenderEnum;
 import com.epmet.commons.tools.enums.HouseTypeEnum;
-import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 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.Result;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.constant.UserConstant;
 import com.epmet.dao.IcResiUserDao;
-import com.epmet.dto.*;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.entity.IcPartyMemberEntity;
 import com.epmet.entity.IcResiUserEntity;
-import com.epmet.excel.handler.DynamicEasyExcelListener;
-import com.epmet.feign.*;
-import com.epmet.service.IcResiUserImportService;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.IcResiUserService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -62,11 +55,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.File;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 用户基础信息
@@ -168,7 +159,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         });
 
         //推送MQ事件
-        IcWarnStatsMQMsg mqMsg = new IcWarnStatsMQMsg();
+        IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg();
         mqMsg.setCustomerId(tokenDto.getCustomerId());
         mqMsg.setIcResiUser(resiUserId);
         SystemMsgFormDTO form = new SystemMsgFormDTO();
@@ -232,7 +223,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         });
 
         //推送MQ事件
-        IcWarnStatsMQMsg mqMsg = new IcWarnStatsMQMsg();
+        IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg();
         mqMsg.setCustomerId(tokenDto.getCustomerId());
         mqMsg.setIcResiUser(resiUserId);
         SystemMsgFormDTO form = new SystemMsgFormDTO();