From 1fa3a53b4437ea1d9f9ef08aff91466a67e6a1e8 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Mon, 23 May 2022 10:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=8F=98=E6=9B=B4mq?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/IcResiUserController.java      |   2 +-
 .../service/impl/IcResiUserServiceImpl.java   | 133 ++++++++++--------
 2 files changed, 72 insertions(+), 63 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 23efa674ad..a1b1e54585 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -231,7 +231,7 @@ public class IcResiUserController implements ResultDataResolver {
      */
     private void sendVolunteerMsg(String customerId, String resiUserId) {
         //发送志愿者人员消息变动
-        boolean flag = SendMqMsgUtil.build().sendRocketMqMsg(SystemMessageType.VOLUNTEER_CHANGED, new MqBaseFormDTO(customerId, resiUserId));
+        boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendRocketMqMsg(SystemMessageType.VOLUNTEER_CHANGED, new MqBaseFormDTO(customerId, resiUserId));
         if (!flag){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"发送志愿者变动消息失败","发送志愿者变动消息失败");
         }
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 17c6ac7aec..cd78e9148d 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
@@ -253,22 +253,24 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
                 //2022.04.19 end
                 //2022.05.18 start zhaoqf 党员信息同步
-                partyMemberDTO.setCustomerId(tokenDto.getCustomerId());
-                partyMemberDTO.setAgencyId(agencyId);
-                partyMemberDTO.setAgencyPids(result.getData().getPids());
-                partyMemberDTO.setIcResiUser(resiUserId);
-                partyMemberDTO.setName(map.get("NAME"));
-                partyMemberDTO.setIdCard(map.get("ID_CARD"));
-                partyMemberDTO.setMobile(map.get("MOBILE"));
-                //查询网格信息
-                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(map.get("GRID_ID"));
-                //查询房屋信息
-                HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), map.get("HOME_ID"));
-                if (null != gridInfo && null != houseInfo) {
-                    String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
-                                    .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
-                            .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
-                    partyMemberDTO.setAddress(address);
+                if (map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(map.get("IS_PARTY"))) {
+                    partyMemberDTO.setCustomerId(tokenDto.getCustomerId());
+                    partyMemberDTO.setAgencyId(agencyId);
+                    partyMemberDTO.setAgencyPids(result.getData().getPids());
+                    partyMemberDTO.setIcResiUser(resiUserId);
+                    partyMemberDTO.setName(map.get("NAME"));
+                    partyMemberDTO.setIdCard(map.get("ID_CARD"));
+                    partyMemberDTO.setMobile(map.get("MOBILE"));
+                    //查询网格信息
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(map.get("GRID_ID"));
+                    //查询房屋信息
+                    HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), map.get("HOME_ID"));
+                    if (null != gridInfo && null != houseInfo) {
+                        String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
+                                .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                                .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                        partyMemberDTO.setAddress(address);
+                    }
                 }
                 //2022.05.18 end zhaoqf
             }
@@ -305,9 +307,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             }
             //2022.05.18 end zhaoqf
         });
-        Result syncResult = resiPartyMemberOpenFeignClient.icPartyMemberSync(partyMemberDTO);
-        if (!syncResult.success()) {
-            log.error("同步党员信息失败");
+        if (StringUtils.isNotBlank(partyMemberDTO.getIcResiUser())) {
+            Result syncResult = resiPartyMemberOpenFeignClient.icPartyMemberSync(partyMemberDTO);
+            if (!syncResult.success()) {
+                log.error("同步党员信息失败");
+            }
         }
         //3.变更记录表和变更记录明细表新增数据
         saveUserChangeRecord(tokenDto,map,resiUserId,name);
@@ -434,46 +438,49 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 resiUserId = map.get("ID");
                 //2022.05.18 start zhaoqf 党员信息同步
                 IcResiUserEntity icResiUser = baseDao.selectById(resiUserId);
-                partyMemberDTO.setCustomerId(tokenDto.getCustomerId());
-                partyMemberDTO.setAgencyId(icResiUser.getAgencyId());
-                partyMemberDTO.setAgencyPids(icResiUser.getPids());
-                partyMemberDTO.setIcResiUser(resiUserId);
-                if (map.containsKey("NAME")) {
-                    partyMemberDTO.setName(map.get("NAME"));
-                } else {
-                    partyMemberDTO.setName(icResiUser.getName());
-                }
-                if (map.containsKey("ID_CARD")) {
-                    partyMemberDTO.setIdCard(map.get("ID_CARD"));
-                } else {
-                    partyMemberDTO.setIdCard(icResiUser.getIdCard());
-                }
-                if (map.containsKey("MOBILE")) {
-                    partyMemberDTO.setMobile(map.get("MOBILE"));
-                } else {
-                    partyMemberDTO.setMobile(icResiUser.getMobile());
-                }
-                //查询网格信息
-                String gridId = null;
-                if (map.containsKey("GRID_ID")) {
-                    gridId = map.get("GRID_ID");
-                } else {
-                    gridId = icResiUser.getGridId();
-                }
-                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(gridId);
-                //查询房屋信息
-                String houseId = null;
-                if (map.containsKey("HOME_ID")) {
-                    houseId = map.get("HOME_ID");
-                } else {
-                    houseId = icResiUser.getHomeId();
-                }
-                HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), houseId);
-                if (null != gridInfo && null != houseInfo) {
-                    String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
-                            .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
-                            .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
-                    partyMemberDTO.setAddress(address);
+                if ((map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(map.get("IS_PARTY")))
+                    || (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty()))) {
+                    partyMemberDTO.setCustomerId(tokenDto.getCustomerId());
+                    partyMemberDTO.setAgencyId(icResiUser.getAgencyId());
+                    partyMemberDTO.setAgencyPids(icResiUser.getPids());
+                    partyMemberDTO.setIcResiUser(resiUserId);
+                    if (map.containsKey("NAME")) {
+                        partyMemberDTO.setName(map.get("NAME"));
+                    } else {
+                        partyMemberDTO.setName(icResiUser.getName());
+                    }
+                    if (map.containsKey("ID_CARD")) {
+                        partyMemberDTO.setIdCard(map.get("ID_CARD"));
+                    } else {
+                        partyMemberDTO.setIdCard(icResiUser.getIdCard());
+                    }
+                    if (map.containsKey("MOBILE")) {
+                        partyMemberDTO.setMobile(map.get("MOBILE"));
+                    } else {
+                        partyMemberDTO.setMobile(icResiUser.getMobile());
+                    }
+                    //查询网格信息
+                    String gridId = null;
+                    if (map.containsKey("GRID_ID")) {
+                        gridId = map.get("GRID_ID");
+                    } else {
+                        gridId = icResiUser.getGridId();
+                    }
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(gridId);
+                    //查询房屋信息
+                    String houseId = null;
+                    if (map.containsKey("HOME_ID")) {
+                        houseId = map.get("HOME_ID");
+                    } else {
+                        houseId = icResiUser.getHomeId();
+                    }
+                    HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), houseId);
+                    if (null != gridInfo && null != houseInfo) {
+                        String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
+                                .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                                .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                        partyMemberDTO.setAddress(address);
+                    }
                 }
                 //2022.05.18 end zhaoqf
             }
@@ -532,9 +539,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             }
             //2022.05.18 end zhaoqf
         });
-        Result syncResult = resiPartyMemberOpenFeignClient.icPartyMemberSync(partyMemberDTO);
-        if (!syncResult.success()) {
-            log.error("同步党员信息失败");
+        if (StringUtils.isNotBlank(partyMemberDTO.getIcResiUser())) {
+            Result syncResult = resiPartyMemberOpenFeignClient.icPartyMemberSync(partyMemberDTO);
+            if (!syncResult.success()) {
+                log.error("同步党员信息失败");
+            }
         }
         return resiUserId;
     }