Merge remote-tracking branch 'origin/lingshan_master' into dev

doc/epmet-cloud.md

@@ -20,6 +20,9 @@ PS:目前正在测试通过负载均衡器和本地环境变量实现动态修
 - dysmsapi.aliyuncs.com   阿里云短信
 - api.weixin.qq.com 微信直接交互（二维码等）
 - oss-cn-qingdao.aliyuncs.com(如果需要用到oss)
+- service.sdmap.gov.cn 地图搜索代理
+- wprd03.is.autonavi.com 地图瓦片代理
+- oapi.dingtalk.com 钉钉后台交互（如果需要）
 
 
 

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

@@ -15,6 +15,7 @@ import com.epmet.constant.SystemMessageType;
 import com.epmet.service.IcNatService;
 import com.epmet.service.IcResiUserService;
 import com.epmet.service.StatsResiWarnService;
+import com.epmet.service.impl.IcResiUserServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
@@ -77,6 +78,10 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently {
             if (!updateIcNatResiFlag(tags, obj)){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"消费失败,等待重新消费");
             }
+
+            //灵山需求：如果放屋里的人，有党员中心户， 将ic_house.party_center_house_flag置为1，说明该房屋是党员中心户
+            SpringContextUtils.getBean(IcResiUserServiceImpl.class).syncHousePartyCenterHouse(null,obj.getIcResiUser());
+
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
             logger.error("【开放数据事件监听器】-居民信息变动MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e)));

epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java

@@ -0,0 +1,34 @@
+package com.epmet.processor;
+
+import com.epmet.commons.rocketmq.messages.IcResiUserAddMQMsg;
+import com.epmet.constant.SystemMessageType;
+import com.epmet.dto.form.SystemMsgFormDTO;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Slf4j
+@Component
+public class ResiImportDyzxhPostProcessor extends ResiImportPostProcessor{
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+
+
+    @Override
+    public void consume(Map<String, String> resiInfoMap) {
+        System.out.println(resiInfoMap);
+        String customerId=resiInfoMap.get("CUSTOMER_ID");
+        String userId=resiInfoMap.get("ID");
+        //推送MQ事件
+        IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg();
+        mqMsg.setCustomerId(customerId);
+        mqMsg.setIcResiUser(userId);
+        SystemMsgFormDTO form = new SystemMsgFormDTO();
+        form.setMessageType(SystemMessageType.IC_RESI_USER_ADD);
+        form.setContent(mqMsg);
+        epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
+    }
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportPostProcessor.java

@@ -0,0 +1,21 @@
+package com.epmet.processor;
+
+import java.util.Map;
+
+/**
+ * @Description 居民信息导入之后的处理方法
+ * @Author wangxianzhang
+ * @Time 2023/5/17 1:33 PM
+ */
+public abstract class ResiImportPostProcessor {
+
+    /**
+     * @Description: 居民信息导入之后的消费方法
+     * @param resiInfoMap: 居民信息map
+     * @Return void
+     * @Author: wangxianzhang
+     * @Date: 2023/5/17 1:33 PM
+     */
+    public abstract void consume(Map<String, String> resiInfoMap);
+
+}

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

@@ -47,6 +47,7 @@ import com.epmet.enums.IcResiUserTableEnum;
 import com.epmet.excel.handler.IcResiImportDynamicExcelListener;
 import com.epmet.excel.handler.IcResiVirtualSheetImportListener;
 import com.epmet.feign.*;
+import com.epmet.processor.ResiImportPostProcessor;
 import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
 import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.IcResiUserImportService;
@@ -172,6 +173,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     private IcPartyMemberDao icPartyMemberDao;
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+    @Autowired
+    private List<ResiImportPostProcessor> resiImportPostProcessors;
 
     /**
      * 子表中不需要的列。因为主表中需要身份证号，网格等信息，但子表中不需要这些列必填，只要有身份证号即可，因此字表判断的时候需要排除这些列
@@ -586,6 +589,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     categoryData = null;
                 }
 
+                // 居民信息导入后置处理器回调
+                resiImportPostProcessors.forEach(p -> p.consume(columnAndValues));
+
             } catch (Exception e) {
                 String errorMsg;
 
@@ -1042,7 +1048,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                         superOptions = new HashMap<>();
                         superOptions.put(superColumnValue, options);
                         itemIdAndOptionsCache.put(currentItemId, superOptions);
-
+                        if (options == null) {
+                            System.out.println(options);
+                        }
                         String colValue = options.get(cellContent);
                         columnWrapper.setColValue(colValue);
                     }

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

@@ -223,8 +223,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             SpringContextUtils.getBean(DataSyncRecordDisabilityService.class).deleteByIcResiUserId(formDTO.getIcResiUserId());
             SpringContextUtils.getBean(DataSyncRecordDeathService.class).deleteByIcResiUserId(formDTO.getIcResiUserId());
         }
-        //灵山需求：如果放屋里的人，有党员中心户， 将ic_house.party_center_house_flag置为1，说明该房屋是党员中心户
-        syncHousePartyCenterHouse(origin.getHomeId(),null);
     }
 
     /**
@@ -456,8 +454,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
         //3.变更记录表和变更记录明细表新增数据
         saveUserChangeRecord(tokenDto, map, resiUserId, name);
-        //灵山需求：如果放屋里的人，有党员中心户， 将ic_house.party_center_house_flag置为1，说明该房屋是党员中心户
-        syncHousePartyCenterHouse(null,resiUserId);
         return resiUserId;
 
     }
@@ -796,8 +792,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             }
         }
         CustomerResiUserRedis.delIcResiUserInfo(resiUserId);
-        //灵山需求：如果放屋里的人，有党员中心户， 将ic_house.party_center_house_flag置为1，说明该房屋是党员中心户
-        syncHousePartyCenterHouse(entity.getHomeId(),null);
         return resiUserId;
     }