From b49f338d1727226faee2e940ea4daac940f591b7 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 16 May 2023 15:43:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=AE=BF=E9=97=AE=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/epmet-cloud.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/epmet-cloud.md b/doc/epmet-cloud.md index 18928176dc..15a6fa173d 100644 --- a/doc/epmet-cloud.md +++ b/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 钉钉后台交互（如果需要） From 465222149b951c9096988b05b7703252c92dd98a Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 17 May 2023 14:03:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E7=9A=84?= =?UTF-8?q?postProcessor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ResiImportDyzxhPostProcessor.java | 13 ++++++++++++ .../processor/ResiImportPostProcessor.java | 21 +++++++++++++++++++ .../impl/IcResiUserImportServiceImpl.java | 10 ++++++++- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportPostProcessor.java diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java new file mode 100644 index 0000000000..a88b085b6c --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java @@ -0,0 +1,13 @@ +package com.epmet.processor; + +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Component +public class ResiImportDyzxhPostProcessor extends ResiImportPostProcessor{ + @Override + public void consume(Map resiInfoMap) { + System.out.println(resiInfoMap); + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportPostProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportPostProcessor.java new file mode 100644 index 0000000000..8fb7633444 --- /dev/null +++ b/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 resiInfoMap); + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index e0b5c91837..81bbe616b5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -46,6 +46,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; @@ -170,6 +171,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res private IcPartyMemberDao icPartyMemberDao; @Autowired private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; + @Autowired + private List resiImportPostProcessors; /** * 子表中不需要的列。因为主表中需要身份证号，网格等信息，但子表中不需要这些列必填，只要有身份证号即可，因此字表判断的时候需要排除这些列 @@ -584,6 +587,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res categoryData = null; } + // 居民信息导入后置处理器回调 + resiImportPostProcessors.forEach(p -> p.consume(columnAndValues)); + } catch (Exception e) { String errorMsg; @@ -1040,7 +1046,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); } From b90add68e6ed129b67164186edec643c0839f7c7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 17 May 2023 14:28:22 +0800 Subject: [PATCH 3/3] test --- .../mq/listener/ICWarnStatsEventListener.java | 5 +++++ .../ResiImportDyzxhPostProcessor.java | 21 +++++++++++++++++++ .../service/impl/IcResiUserServiceImpl.java | 6 ------ 3 files changed, 26 insertions(+), 6 deletions(-) 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 c1328f548a..8d9b07a7ab 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 @@ -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))); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java index a88b085b6c..a4fd8ccd55 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java @@ -1,13 +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 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); } } 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 681c0cc358..b149345970 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 @@ -219,8 +219,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl