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 钉钉后台交互(如果需要) 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 80d337f65d..e8a9d9d057 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 @@ -45,6 +45,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; @@ -169,6 +170,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res private IcPartyMemberDao icPartyMemberDao; @Autowired private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; + @Autowired + private List resiImportPostProcessors; /** * 子表中不需要的列。因为主表中需要身份证号,网格等信息,但子表中不需要这些列必填,只要有身份证号即可,因此字表判断的时候需要排除这些列 @@ -583,6 +586,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res categoryData = null; } + // 居民信息导入后置处理器回调 + resiImportPostProcessors.forEach(p -> p.consume(columnAndValues)); + } catch (Exception e) { String errorMsg; @@ -1039,7 +1045,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); }