From 41d249672ae6774397b89431b154c5ae98be8b62 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 4 Nov 2021 17:04:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E5=8F=98=E6=9B=B4=E6=8E=A8=E9=80=81?= =?UTF-8?q?mq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constants/ConsomerGroupConstants.java | 5 + .../rocketmq/constants/TopicConstants.java | 5 + .../rocketmq/messages/IcWarnStatsMQMsg.java | 20 ++++ .../com/epmet/constant/SystemMessageType.java | 10 ++ .../impl/SystemMessageServiceImpl.java | 4 + epmet-user/epmet-user-server/pom.xml | 12 ++ .../epmet/mq/RocketMQWarnStatsRegister.java | 31 ++++++ .../mq/listener/ICWarnStatsEventListener.java | 104 ++++++++++++++++++ .../listener/InitCustomerRolesListener.java | 39 ------- .../service/impl/IcResiUserServiceImpl.java | 29 ++++- .../src/main/resources/bootstrap.yml | 4 +- 11 files changed, 217 insertions(+), 46 deletions(-) create mode 100644 epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/IcWarnStatsMQMsg.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/mq/RocketMQWarnStatsRegister.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java delete mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/InitCustomerRolesListener.java diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java index fb5ae07412..93894c0bdb 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java @@ -65,4 +65,9 @@ public interface ConsomerGroupConstants { */ String OPEN_DATA_PROJECT_CHANGE_EVENT_LISTENER_GROUP = "open_data_project_change_event_listener_group"; + /** + * 开放的人员信息变更预警统计 + */ + String IC_WARN_STATS_EVENT_LISTENER_GROUP = "ic_warn_stats_event_listener_group"; + } diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java index 3f0c3066ec..13217da550 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java @@ -48,4 +48,9 @@ public interface TopicConstants { * 项目 */ String PROJECT = "project"; + + /** + * 项目 + */ + String IC_RESI_USER = "ic_resi_user"; } diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/IcWarnStatsMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/IcWarnStatsMQMsg.java new file mode 100644 index 0000000000..b78863ef4c --- /dev/null +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/IcWarnStatsMQMsg.java @@ -0,0 +1,20 @@ +package com.epmet.commons.rocketmq.messages; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 居民信息新增、修改推送MQ + * @author sun + */ +@Data +public class IcWarnStatsMQMsg implements Serializable { + + //客户Id + private String customerId; + //居民ID + private String icResiUser; + + +} diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java index 84580a3b4a..4536d6c330 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java @@ -85,4 +85,14 @@ public interface SystemMessageType { */ String PROJECT_EDIT = "project_edit"; + /** + * 居民信息添加 + */ + String IC_RESI_USER_ADD = "ic_resi_user_add"; + + /** + * 居民信息修改 + */ + String IC_RESI_USER_EDIT = "ic_resi_user_edit"; + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java index 61373708df..ee4990405f 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java @@ -187,6 +187,10 @@ public class SystemMessageServiceImpl implements SystemMessageService { case SystemMessageType.PROJECT_EDIT: topic = TopicConstants.PROJECT; break; + case SystemMessageType.IC_RESI_USER_ADD: + case SystemMessageType.IC_RESI_USER_EDIT: + topic = TopicConstants.IC_RESI_USER; + break; } return topic; } diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 1b0eafe16d..790d22ecf2 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -222,6 +222,9 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd + + true + 192.168.1.140:9876;192.168.1.141:9876 @@ -264,6 +267,9 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd https://epmet-dev.elinkservice.cn/api/epmetscan/api + + false + 192.168.1.140:9876;192.168.1.141:9876 @@ -305,6 +311,9 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd + + true + 192.168.1.140:9876;192.168.1.141:9876 @@ -345,6 +354,9 @@ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1 + + true + 192.168.1.140:9876;192.168.1.141:9876 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/RocketMQWarnStatsRegister.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/RocketMQWarnStatsRegister.java new file mode 100644 index 0000000000..2e7068ae04 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/RocketMQWarnStatsRegister.java @@ -0,0 +1,31 @@ +package com.epmet.mq; + +import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants; +import com.epmet.commons.rocketmq.constants.TopicConstants; +import com.epmet.commons.rocketmq.register.MQAbstractRegister; +import com.epmet.commons.rocketmq.register.MQConsumerProperties; +import com.epmet.mq.listener.ICWarnStatsEventListener; +import org.apache.rocketmq.common.protocol.heartbeat.MessageModel; +import org.springframework.stereotype.Component; + +/** + * @Description 如果rocketmq.enable=true，这里必须实现，且 实例化 + * @author wxz + * @date 2021.07.14 17:13:41 +*/ +@Component +public class RocketMQWarnStatsRegister extends MQAbstractRegister { + + @Override + public void registerAllListeners(String env, MQConsumerProperties consumerProperties) { + // 客户初始化监听器注册 + register(consumerProperties, + ConsomerGroupConstants.IC_WARN_STATS_EVENT_LISTENER_GROUP, + MessageModel.CLUSTERING, + TopicConstants.IC_RESI_USER, + "*", + new ICWarnStatsEventListener()); + + // ...其他监听器类似 + } +} 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 new file mode 100644 index 0000000000..3a16ec247e --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java @@ -0,0 +1,104 @@ +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.tools.distributedlock.DistributedLock; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.utils.SpringContextUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; +import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; +import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently; +import org.apache.rocketmq.common.message.MessageExt; +import org.redisson.api.RLock; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; +import java.util.concurrent.TimeUnit; + +/** + * @Description 负能平台-客户居民信息变动监听器 + * @author wxz + * @date 2021.10.13 15:21:48 +*/ +public class ICWarnStatsEventListener implements MessageListenerConcurrently { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + private RedisUtils redisUtils; + + @Override + public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { + + if (redisUtils == null) { + redisUtils = SpringContextUtils.getBean(RedisUtils.class); + } + + try { + msgs.forEach(msg -> consumeMessage(msg)); + } catch (Exception e) { + logger.error(ExceptionUtils.getErrorStackTrace(e)); + return ConsumeConcurrentlyStatus.RECONSUME_LATER; + } + return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; + } + + private void consumeMessage(MessageExt messageExt) { + // msg即为消息体 + // tags为SystemMessageType.java中的项，为具体的操作，此处拿到tags，判断是创建还是变更，来做响应的后续操作即可 + String msg = new String(messageExt.getBody()); + String topic = messageExt.getTopic(); + String tags = messageExt.getTags(); + String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL); + + logger.info("【开放数据事件监听器】-居民信息变动-收到消息内容:{},操作:{}", msg, tags); + IcWarnStatsMQMsg obj = JSON.parseObject(msg, IcWarnStatsMQMsg.class); + + DistributedLock distributedLock = null; + RLock lock = null; + try { + distributedLock = SpringContextUtils.getBean(DistributedLock.class); + lock = distributedLock.getLock(String.format("lock:ic_warn_stats:%s", obj.getCustomerId()), + 30L, 30L, TimeUnit.SECONDS); + System.out.println("嘻嘻哈哈哈乐乐呵呵-----------"); + //待执行方法 + //SpringContextUtils.getBean(BaseGridInfoService.class).getAgencyBaseInfo(obj); + } catch (RenException e) { + // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 + logger.error("【开放数据事件监听器】-客户居民信息变动MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + } catch (Exception e) { + // 不是我们自己抛出的异常，可以让MQ重试 + logger.error("【开放数据事件监听器】-客户居民信息变动MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + throw e; + } finally { + distributedLock.unLock(lock); + } + + if (StringUtils.isNotBlank(pendingMsgLabel)) { + try { + removePendingMqMsgCache(pendingMsgLabel); + } catch (Exception e) { + logger.error("【开放数据事件监听器】-删除mq阻塞消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + } + + /** + * @description + * + * @param pendingMsgLabel + * @return + * @author wxz + * @date 2021.10.14 16:32:32 + */ + private void removePendingMqMsgCache(String pendingMsgLabel) { + String key = RedisKeys.blockedMqMsgKey(pendingMsgLabel); + redisUtils.delete(key); + //logger.info("【开放数据事件监听器】删除mq阻塞消息缓存成功,blockedMsgLabel:{}", pendingMsgLabel); + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/InitCustomerRolesListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/InitCustomerRolesListener.java deleted file mode 100644 index a50da7561e..0000000000 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/InitCustomerRolesListener.java +++ /dev/null @@ -1,39 +0,0 @@ -//package com.epmet.mq.listener; -// -//import com.alibaba.fastjson.JSON; -//import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants; -//import com.epmet.commons.rocketmq.constants.TopicConstants; -//import com.epmet.commons.rocketmq.messages.InitCustomerMQMsg; -//import com.epmet.service.GovStaffRoleService; -//import org.apache.rocketmq.common.message.MessageExt; -//import org.apache.rocketmq.spring.annotation.MessageModel; -//import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; -//import org.apache.rocketmq.spring.core.RocketMQListener; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Component; -// -///** -// * 监听初始化客户动作，为客户初始化角色列表 -// */ -//@RocketMQMessageListener(topic = TopicConstants.INIT_CUSTOMER, -// consumerGroup = ConsomerGroupConstants.INIT_CUSTOMER_ROLES_GROUP, -// messageModel = MessageModel.CLUSTERING, -// selectorExpression = "*") -//@Component -//public class InitCustomerRolesListener implements RocketMQListener { -// -// private Logger logger = LoggerFactory.getLogger(getClass()); -// -// @Autowired -// private GovStaffRoleService govStaffRoleService; -// -// @Override -// public void onMessage(MessageExt messageExt) { -// String msg = new String(messageExt.getBody()); -// logger.info("初始化客户-初始化角色列表-收到消息内容:{}", msg); -// InitCustomerMQMsg msgObj = JSON.parseObject(msg, InitCustomerMQMsg.class); -// govStaffRoleService.initGovStaffRolesForCustomer(msgObj.getCustomerId()); -// } -//} 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 9b76ac18f4..991fac2c6d 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 @@ -22,6 +22,7 @@ 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.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; @@ -39,6 +40,7 @@ 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.*; @@ -46,10 +48,7 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.IcResiUserEntity; import com.epmet.excel.handler.DynamicEasyExcelListener; -import com.epmet.feign.EpmetAdminOpenFeignClient; -import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.feign.GovOrgOpenFeignClient; -import com.epmet.feign.OperCustomizeOpenFeignClient; +import com.epmet.feign.*; import com.epmet.service.IcResiUserService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -57,8 +56,6 @@ import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -90,6 +87,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Thu, 4 Nov 2021 17:42:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?agg=E5=8E=9F=E6=8E=A5=E5=8F=A3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmetuser/form/IcResiDetailFormDTO.java | 26 -- .../epmetuser/form/IcResiUserPageFormDTO.java | 38 --- .../epmetuser/form/ResiUserQueryValueDTO.java | 20 -- .../result/IcResiUserPageResultDTO.java | 173 ------------ .../dto/govorg/result/HouseInfoDTO.java | 61 ----- .../controller/IcResiUserController.java | 72 ----- .../dao/epmetuser/IcResiUserDao.java | 45 ---- .../dao/govorg/CustomerAgencyDao.java | 1 - .../dao/opercustomize/CustomerFootBarDao.java | 5 - .../service/epmetuser/IcResiUserService.java | 32 --- .../epmetuser/impl/IcResiUserServiceImpl.java | 255 ------------------ .../service/govorg/GovOrgService.java | 2 - .../govorg/impl/GovOrgServiceImpl.java | 7 - .../opercustomize/CustomerFootBarService.java | 9 - .../impl/CustomerFootBarServiceImpl.java | 15 -- .../mapper/epmetuser/IcResiUserDao.xml | 129 --------- .../mapper/govorg/CustomerAgencyDao.xml | 22 -- .../opercustomize/CustomerFootBarDao.xml | 50 ---- 18 files changed, 962 deletions(-) delete mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/IcResiDetailFormDTO.java delete mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/IcResiUserPageFormDTO.java delete mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResiUserQueryValueDTO.java delete mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserPageResultDTO.java delete mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/HouseInfoDTO.java delete mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcResiUserController.java delete mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java delete mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiUserService.java delete mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java delete mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/IcResiDetailFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/IcResiDetailFormDTO.java deleted file mode 100644 index e7952a1ef4..0000000000 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/IcResiDetailFormDTO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.epmet.dataaggre.dto.epmetuser.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -/** - * @Description 查看详情，回显表单 - * @Author yinzuomei - * @Date 2021/10/27 10:22 下午 - */ -@Data -public class IcResiDetailFormDTO implements Serializable { - public interface AddUserInternalGroup { - } - @NotBlank(message = "icResiUserId不能为空",groups = AddUserInternalGroup.class) - private String icResiUserId; - - @NotBlank(message = "formCode不能为空", groups = AddUserInternalGroup.class) - private String formCode; - - @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) - private String customerId; -} - diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/IcResiUserPageFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/IcResiUserPageFormDTO.java deleted file mode 100644 index 04dc8f0943..0000000000 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/IcResiUserPageFormDTO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.epmet.dataaggre.dto.epmetuser.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - * @Description 居民信息，分页查询入参 - * @Author yinzuomei - * @Date 2021/10/27 2:06 下午 - */ -@Data -public class IcResiUserPageFormDTO implements Serializable { - public interface AddUserInternalGroup { - } - - @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class) - private Integer pageNo; - - @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class) - private Integer pageSize; - - @NotBlank(message = "formCode不能为空", groups = AddUserInternalGroup.class) - private String formCode; - - @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) - private String customerId; - - /** - * 表对应的字段及值 - */ - private List conditions; - private Boolean pageFlag; -} - diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResiUserQueryValueDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResiUserQueryValueDTO.java deleted file mode 100644 index 7e11156ba3..0000000000 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResiUserQueryValueDTO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.epmet.dataaggre.dto.epmetuser.form; - -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description TODO - * @Author yinzuomei - * @Date 2021/10/27 6:02 下午 - */ -@Data -public class ResiUserQueryValueDTO implements Serializable { - private String queryType; - private List columnValue; - private String columnName; - private String tableName; -} - diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserPageResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserPageResultDTO.java deleted file mode 100644 index e737bcec54..0000000000 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserPageResultDTO.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.epmet.dataaggre.dto.epmetuser.result; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description 居民信息分页查询表单返参 - * @Author yinzuomei - * @Date 2021/10/27 2:07 下午 - */ -@Data -public class IcResiUserPageResultDTO implements Serializable { - private String icResiUserId; - private String gridId; - private String gridName; - /** - * 所属小区ID - */ - private String villageId; - private String vallageName; - - - /** - * 所属楼宇Id - */ - private String buildId; - private String buildName; - - /** - * 单元id - */ - private String unitId; - private String unitName; - - /** - * 所属家庭Id - */ - private String homeId; - private String homeName; - - /** - * 姓名 - */ - private String name; - - /** - * 手机号 - */ - private String mobile; - - /** - * 性别 - */ - private String gender; - - /** - * 身份证号 - */ - private String idCard; - - /** - * 出生日期 - */ - private String birthday; - - /** - * 备注 - */ - private String remarks; - - /** - * 是否党员 - */ - private Boolean isParty; - - /** - * 是否低保户 - */ - private Boolean isDbh; - - /** - * 是否保障房 - */ - private Boolean isEnsureHouse; - - /** - * 是否失业 - */ - private Boolean isUnemployed; - - /** - * 是否育龄妇女 - */ - private Boolean isYlfn; - - /** - * 是否退役军人 - */ - private Boolean isVeterans; - - /** - * 是否统战人员 - */ - private Boolean isUnitedFront; - - /** - * 是否信访人员 - */ - private Boolean isXfry; - - /** - * 是否志愿者 - */ - private Boolean isVolunteer; - - /** - * 是否老年人 - */ - private Boolean isOldPeople; - - /** - * 是否空巢 - */ - private Boolean isKc; - - /** - * 是否失独 - */ - private Boolean isSd; - - /** - * 是否失能 - */ - private Boolean isSn; - - /** - * 是否失智 - */ - private Boolean isSz; - - /** - * 是否残疾 - */ - private Boolean isCj; - - /** - * 是否大病 - */ - private Boolean isDb; - - /** - * 是否慢病 - */ - private Boolean isMb; - - /** - * 是否特殊人群 - */ - private Boolean isSpecial; - - - // 以下属性都需要单独处理，不是直接取数据库的字段 - private String demandCategoryIds; - - private String demandName; - - /** - * 房屋类型，1楼房，2平房，3别墅 - */ - private String houseType; -} - diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/HouseInfoDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/HouseInfoDTO.java deleted file mode 100644 index fc98843047..0000000000 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/HouseInfoDTO.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.epmet.dataaggre.dto.govorg.result; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description TODO - * @Author yinzuomei - * @Date 2021/10/28 2:05 下午 - */ -@Data -public class HouseInfoDTO implements Serializable { - private static final long serialVersionUID = -5204197079709062825L; - /** - * 所属家庭Id - */ - private String homeId; - - - /** - * 小区id - */ - private String neighborHoodId; - /** - * 小区名称 - */ - private String neighborHoodName; - - - /** - * 所属楼栋id - */ - private String buildingId; - /** - * 楼栋名称 - */ - private String buildingName; - - - /** - * 所属单元id - */ - private String buildingUnitId; - /** - * 单元名 - */ - private String unitName; - - - /** - * 门牌号 - */ - private String doorName; - - /** - * 房屋类型，1楼房，2平房，3别墅 - */ - private String houseType; -} - diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcResiUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcResiUserController.java deleted file mode 100644 index 4058ff5293..0000000000 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcResiUserController.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.epmet.dataaggre.controller; - -import com.epmet.commons.tools.annotation.LoginUser; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dataaggre.dto.epmetuser.form.IcResiDetailFormDTO; -import com.epmet.dataaggre.dto.epmetuser.form.IcResiUserPageFormDTO; -import com.epmet.dataaggre.dto.epmetuser.result.IcResiUserPageResultDTO; -import com.epmet.dataaggre.service.epmetuser.IcResiUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Map; - -/** - * @Description TODO - * @Author yinzuomei - * @Date 2021/10/27 2:03 下午 - */ -@RestController -@RequestMapping("icresiuser") -public class IcResiUserController { - - @Autowired - private IcResiUserService icResiUserService; - - - /** - * 分页查询居民信息列表 - * - * @param tokenDto - * @param pageFormDTO - * @return com.epmet.commons.tools.utils.Result> - * @author yinzuomei - * @date 2021/10/28 10:29 上午 - */ - //@PostMapping("listresi1") - public Result> queryListResi(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO){ - //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); - pageFormDTO.setCustomerId(tokenDto.getCustomerId()); - ValidatorUtils.validateEntity(pageFormDTO,IcResiUserPageFormDTO.AddUserInternalGroup.class); - return new Result>().ok(icResiUserService.pageResi(pageFormDTO)); - } - - //@PostMapping("listresi") - public Result>> queryListResi1(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO){ - //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); - pageFormDTO.setCustomerId(tokenDto.getCustomerId()); - ValidatorUtils.validateEntity(pageFormDTO,IcResiUserPageFormDTO.AddUserInternalGroup.class); - return new Result>>().ok(icResiUserService.pageResiMap(pageFormDTO)); - } - /** - * 编辑页面，显示居民信息详情 - * - * @param pageFormDTO - * @return com.epmet.commons.tools.utils.Result - * @author yinzuomei - * @date 2021/10/28 10:29 上午 - */ - //@PostMapping("detail") - public Result queryIcResiDetail(@LoginUser TokenDto tokenDto,@RequestBody IcResiDetailFormDTO pageFormDTO){ - //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); - pageFormDTO.setCustomerId(tokenDto.getCustomerId()); - ValidatorUtils.validateEntity(pageFormDTO,IcResiDetailFormDTO.AddUserInternalGroup.class); - return new Result().ok(icResiUserService.queryIcResiDetail(pageFormDTO)); - } -} - diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java deleted file mode 100644 index fbfc9564d5..0000000000 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.epmet.dataaggre.dao.epmetuser; - -import com.epmet.dataaggre.dto.epmetuser.IcFormResColumnDTO; -import com.epmet.dataaggre.dto.epmetuser.form.ResiUserQueryValueDTO; -import com.epmet.dataaggre.dto.epmetuser.result.IcResiUserPageResultDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -@Mapper -public interface IcResiUserDao { - List selectListResi(@Param("customerId") String customerId, - @Param("formCode") String formCode, - @Param("conditions") List conditions, - @Param("resultColumns") List resultColumns, - @Param("subTables") List subTables); - List> selectListResiMap(@Param("customerId") String customerId, - @Param("formCode") String formCode, - @Param("conditions") List conditions, - @Param("resultColumns") List resultColumns, - @Param("subTables") List subTables); - /** - * 查询主表 - * - * @param icResiUserId - * @return java.util.List> - * @author yinzuomei - * @date 2021/10/28 11:20 上午 - */ - List> selectById(String icResiUserId); - - /** - * 根据ic_resi_user.id去查询各个子表记录，动态传入表名 - * - * @param icResiUserId - * @param tableName - * @return java.util.List> - * @author yinzuomei - * @date 2021/10/28 11:19 上午 - */ - List> selectSubTableRecords(@Param("icResiUserId") String icResiUserId,@Param("tableName") String tableName); - -} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java index 33f676721b..3ecfd18a2d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java @@ -100,5 +100,4 @@ public interface CustomerAgencyDao extends BaseDao { */ List getOrgList(@Param("staffId") String staffId); - List queryHouseInfo(@Param("houseIdList") Set houseIdList); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/CustomerFootBarDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/CustomerFootBarDao.java index aaba329a6f..4d5ab737b5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/CustomerFootBarDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/CustomerFootBarDao.java @@ -59,9 +59,4 @@ public interface CustomerFootBarDao extends BaseDao { */ CustomerFootBarEntity selectDefaultIcon(@Param("customerId") String customerId, @Param("appType")String appType, @Param("barKey")String barKey); - List queryConditions(@Param("customerId") String customerId, @Param("formCode")String formCode); - - List querySubTables(@Param("customerId") String customerId, @Param("formCode")String formCode); - - Set queryIcResiSubTables(@Param("customerId") String customerId, @Param("formCode")String formCode); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiUserService.java deleted file mode 100644 index ab112bfa8a..0000000000 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiUserService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.epmet.dataaggre.service.epmetuser; - -import com.epmet.commons.tools.page.PageData; -import com.epmet.dataaggre.dto.epmetuser.form.IcResiDetailFormDTO; -import com.epmet.dataaggre.dto.epmetuser.form.IcResiUserPageFormDTO; -import com.epmet.dataaggre.dto.epmetuser.result.IcResiUserPageResultDTO; - -import java.util.Map; - -public interface IcResiUserService { - /** - * 分页查询居民信息列表 - * - * @param pageFormDTO - * @return com.epmet.commons.tools.page.PageData - * @author yinzuomei - * @date 2021/10/28 10:30 上午 - */ - @Deprecated - PageData pageResi(IcResiUserPageFormDTO pageFormDTO); - - PageData> pageResiMap(IcResiUserPageFormDTO formDTO); - /** - * 编辑页面，显示居民信息详情 - * - * @param pageFormDTO - * @return java.util.Map - * @author yinzuomei - * @date 2021/10/28 10:29 上午 - */ - Map queryIcResiDetail(IcResiDetailFormDTO pageFormDTO); -} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java deleted file mode 100644 index a3dbfc59b3..0000000000 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java +++ /dev/null @@ -1,255 +0,0 @@ -package com.epmet.dataaggre.service.epmetuser.impl; - -import com.alibaba.fastjson.JSON; -import com.epmet.commons.dynamic.datasource.annotation.DataSource; -import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.constant.StrConstant; -import com.epmet.commons.tools.enums.GenderEnum; -import com.epmet.commons.tools.enums.HouseTypeEnum; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dataaggre.constant.DataSourceConstant; -import com.epmet.dataaggre.constant.OrgConstant; -import com.epmet.dataaggre.dao.epmetuser.IcResiUserDao; -import com.epmet.dataaggre.dto.epmetuser.IcFormResColumnDTO; -import com.epmet.dataaggre.dto.epmetuser.form.IcResiDetailFormDTO; -import com.epmet.dataaggre.dto.epmetuser.form.IcResiUserPageFormDTO; -import com.epmet.dataaggre.dto.epmetuser.result.IcResiUserPageResultDTO; -import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO; -import com.epmet.dataaggre.dto.govorg.result.HouseInfoDTO; -import com.epmet.dataaggre.service.epmetuser.IcResiUserService; -import com.epmet.dataaggre.service.govorg.GovOrgService; -import com.epmet.dataaggre.service.opercustomize.CustomerFootBarService; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @Description TODO - * @Author yinzuomei - * @Date 2021/10/27 2:04 下午 - */ -@Service -@DataSource(DataSourceConstant.EPMET_USER) -@Slf4j -public class IcResiUserServiceImpl implements IcResiUserService { - @Autowired - private IcResiUserDao icResiUserDao; - @Autowired - private CustomerFootBarService customerFootBarService; - @Autowired - private GovOrgService govOrgService; - - - /** - * 分页查询居民信息列表 - * - * @param formDTO - * @return com.epmet.commons.tools.page.PageData - * @author yinzuomei - * @date 2021/10/28 10:30 上午 - */ - @Override - public PageData pageResi(IcResiUserPageFormDTO formDTO) { - // 查询列表展示项，如果没有，直接返回 - List resultColumns = customerFootBarService.queryConditions(formDTO.getCustomerId(), formDTO.getFormCode()); - if (CollectionUtils.isEmpty(resultColumns)) { - log.warn("没有配置列表展示列"); - return new PageData(new ArrayList(), NumConstant.ZERO); - } - log.warn("列表展示项：" + JSON.toJSONString(resultColumns)); - // 查询列表展示项需要用到哪些子表 - // 拼接好的left join table_name on (ic_resi_user.ID=table_name.IC_RESI_USER AND table_name.del_flag='0') - List subTables = customerFootBarService.querySubTables(formDTO.getCustomerId(), formDTO.getFormCode()); - log.warn("子表：" + JSON.toJSONString(subTables)); - /* Set subTableList=resultColumns.stream().filter(item->!item.getTableName().equals("ic_resi_user") - && StringUtils.isNotBlank(item.getLink())) - .map(IcFormResColumnDTO :: getTableName).collect(Collectors.toSet()); - List subTables=new ArrayList<>(); - subTableList.forEach(tableName->{ - //'left join ',temp.TABLE_NAME, ' on ( ic_resi_user.ID=',temp.TABLE_NAME,'.IC_RESI_USER and ',temp.TABLE_NAME,'.del_flag="0" )' - String joinSql=String.format("% join %s on ( ic_resi_user.ID=%s.IC_RESI_USER and %s.del_flag=\"0\" "); - subTables.add(joinSql); - });*/ - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), - formDTO.getPageSize()).doSelectPageInfo(() -> icResiUserDao.selectListResi(formDTO.getCustomerId(), - formDTO.getFormCode(), - formDTO.getConditions(), - resultColumns, - subTables)); - List list = pageInfo.getList(); - //查询网格名称 - List gridIds = list.stream().map(IcResiUserPageResultDTO::getGridId).collect(Collectors.toList()); - log.warn("gridIds:" + JSON.toJSONString(gridIds)); - - List gridInfoList = govOrgService.gridListByIds(gridIds); - log.warn(JSON.toJSONString(gridInfoList)); - - Map gridInfoMap = gridInfoList.stream().collect(Collectors.toMap(GridsInfoListResultDTO::getGridId, Function.identity())); - - //查询房子名称 - Set houseIds = list.stream().map(IcResiUserPageResultDTO::getHomeId).collect(Collectors.toSet()); - List houseInfoDTOList = govOrgService.queryHouseInfo(houseIds); - Map houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity())); - for (IcResiUserPageResultDTO resultDTO : list) { - if (null != gridInfoMap && gridInfoMap.containsKey(resultDTO.getGridId())) { - resultDTO.setGridName(gridInfoMap.get(resultDTO.getGridId()).getGridName()); - } - if (null != houseInfoMap && houseInfoMap.containsKey(resultDTO.getHomeId())) { - resultDTO.setBuildName(houseInfoMap.get(resultDTO.getHomeId()).getBuildingName()); - resultDTO.setVallageName(houseInfoMap.get(resultDTO.getHomeId()).getNeighborHoodName()); - resultDTO.setUnitName(houseInfoMap.get(resultDTO.getHomeId()).getUnitName()); - resultDTO.setHomeName(houseInfoMap.get(resultDTO.getHomeId()).getDoorName()); - resultDTO.setHouseType(houseInfoMap.get(resultDTO.getHomeId()).getHouseType()); - } - } - pageInfo.setList(list); - return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); - } - - - public PageData> pageResiMap(IcResiUserPageFormDTO formDTO) { - // 查询列表展示项，如果没有，直接返回 - List resultColumns = customerFootBarService.queryConditions(formDTO.getCustomerId(), formDTO.getFormCode()); - if (CollectionUtils.isEmpty(resultColumns)) { - log.warn("没有配置列表展示列"); - return new PageData(new ArrayList(), NumConstant.ZERO); - } - // 查询列表展示项需要用到哪些子表 - // 拼接好的left join table_name on (ic_resi_user.ID=table_name.IC_RESI_USER AND table_name.del_flag='0') - List subTables = customerFootBarService.querySubTables(formDTO.getCustomerId(), formDTO.getFormCode()); - PageInfo> pageInfo=new PageInfo<>(); - if (null == formDTO.getPageFlag()||formDTO.getPageFlag()) { - //分页 - pageInfo= PageHelper.startPage(formDTO.getPageNo(), - formDTO.getPageSize()).doSelectPageInfo(() -> icResiUserDao.selectListResiMap(formDTO.getCustomerId(), - formDTO.getFormCode(), - formDTO.getConditions(), - resultColumns, - subTables)); - }else{ - List> list=icResiUserDao.selectListResiMap(formDTO.getCustomerId(), - formDTO.getFormCode(), - formDTO.getConditions(), - resultColumns, - subTables); - pageInfo.setTotal(CollectionUtils.isEmpty(list)?NumConstant.ZERO:list.size()); - pageInfo.setList(list); - } - - List> list = pageInfo.getList(); - //查询网格名称 - List gridIds = new ArrayList<>(); - Set houseIds = new HashSet<>(); - for (Map map : list) { - log.warn(JSON.toJSONString(map)); - if (map.containsKey(OrgConstant.GRID_ID) && null != map.get(OrgConstant.GRID_ID) && StringUtils.isNotBlank(map.get(OrgConstant.GRID_ID).toString())) { - gridIds.add(map.get(OrgConstant.GRID_ID).toString()); - } - if (map.containsKey("HOME_ID") && null != map.get("HOME_ID") && StringUtils.isNotBlank(map.get("HOME_ID").toString())) { - houseIds.add(map.get("HOME_ID").toString()); - } - } - - List gridInfoList = govOrgService.gridListByIds(gridIds); - - Map gridInfoMap = gridInfoList.stream().collect(Collectors.toMap(GridsInfoListResultDTO::getGridId, Function.identity())); - - //查询房子名称 - List houseInfoDTOList = govOrgService.queryHouseInfo(houseIds); - Map houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity())); - for (Map resultMap : list) { - String gridIdValue = null != resultMap.get(OrgConstant.GRID_ID) ? resultMap.get(OrgConstant.GRID_ID).toString() : StrConstant.EPMETY_STR; - resultMap.put("GRID_ID_VALUE", gridIdValue); - if (null != gridInfoMap && gridInfoMap.containsKey(gridIdValue) && null != gridInfoMap.get(gridIdValue)) { - //GRID_NAME - resultMap.put(OrgConstant.GRID_ID, gridInfoMap.get(gridIdValue).getGridName()); - } - - String homeId = null != resultMap.get("HOME_ID") ? resultMap.get("HOME_ID").toString() : StrConstant.EPMETY_STR; - resultMap.put("HOME_ID_VALUE", homeId); - if (null != houseInfoMap && houseInfoMap.containsKey(homeId) && null != houseInfoMap.get(homeId)) { - HouseInfoDTO houseInfoDTO = houseInfoMap.get(homeId); - String buildName = StringUtils.isNotBlank(houseInfoDTO.getBuildingName()) ? houseInfoDTO.getBuildingName() : StrConstant.EPMETY_STR; - resultMap.put("BUILD_NAME", buildName); - - String neighBorName = StringUtils.isNotBlank(houseInfoDTO.getNeighborHoodName()) ? houseInfoDTO.getNeighborHoodName() : StrConstant.EPMETY_STR; - resultMap.put("VILLAGE_NAME", neighBorName); - - String unitName = StringUtils.isNotBlank(houseInfoDTO.getUnitName()) ? houseInfoDTO.getUnitName() : StrConstant.EPMETY_STR; - resultMap.put("UNIT_NAME", unitName); - - String doorName = StringUtils.isNotBlank(houseInfoDTO.getDoorName()) ? houseInfoDTO.getDoorName() : StrConstant.EPMETY_STR; - resultMap.put("DOOR_NAME", doorName); - - String houseType = StringUtils.isNotBlank(houseInfoDTO.getHouseType()) ? houseInfoDTO.getHouseType() : StrConstant.EPMETY_STR; - //房屋类型，1楼房，2平房，3别墅 - resultMap.put(OrgConstant.HOUSE_TYPE_KEY, ""); - if (HouseTypeEnum.LOUFANG.getCode().equals(houseType)) { - resultMap.put(OrgConstant.HOUSE_TYPE_KEY, HouseTypeEnum.LOUFANG.getName()); - } else if (HouseTypeEnum.PINGFANG.getCode().equals(houseType)) { - resultMap.put(OrgConstant.HOUSE_TYPE_KEY, HouseTypeEnum.PINGFANG.getName()); - } else if (HouseTypeEnum.BIESHU.getCode().equals(houseType)) { - resultMap.put(OrgConstant.HOUSE_TYPE_KEY, HouseTypeEnum.BIESHU.getName()); - } - - resultMap.put("HOME_ID", neighBorName.concat(buildName).concat(unitName).concat(doorName)); - } - - if (resultMap.containsKey(OrgConstant.GENDER)) { - String genderValue = null != resultMap.get(OrgConstant.GENDER) ? resultMap.get(OrgConstant.GENDER).toString() : StrConstant.EPMETY_STR; - if (GenderEnum.MAN.getCode().equals(genderValue)) { - resultMap.put(OrgConstant.GENDER, GenderEnum.MAN.getName()); - } else if (GenderEnum.WOMAN.getCode().equals(genderValue)) { - resultMap.put(OrgConstant.GENDER, GenderEnum.WOMAN.getName()); - } else if (GenderEnum.UN_KNOWN.getCode().equals(genderValue)) { - resultMap.put(OrgConstant.GENDER, GenderEnum.UN_KNOWN.getName()); - } - } - } - pageInfo.setList(list); - return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); - } - - /** - * 编辑页面，显示居民信息详情 - * - * @param pageFormDTO - * @return java.util.Map - * @author yinzuomei - * @date 2021/10/28 10:29 上午 - */ - @Override - public Map queryIcResiDetail(IcResiDetailFormDTO pageFormDTO) { - Map resultMap = new HashMap(); - // 先查询主表，主表没有记录，直接返回空 - List> icResiUserMapList = icResiUserDao.selectById(pageFormDTO.getIcResiUserId()); - if (CollectionUtils.isEmpty(icResiUserMapList)) { - return new HashMap(); - } - resultMap.put("ic_resi_user", icResiUserMapList); - - //循环查询每个子表的记录 - Set subTableList = customerFootBarService.queryIcResiSubTables(pageFormDTO.getCustomerId(), pageFormDTO.getFormCode()); - for (String subTalbeName : subTableList) { - List> list = icResiUserDao.selectSubTableRecords(pageFormDTO.getIcResiUserId(), subTalbeName); - if (!CollectionUtils.isEmpty(list)) { - resultMap.put(subTalbeName, list); - } - //else{ - // resultMap.put(subTalbeName,new ArrayList<>()); - //} - } - return resultMap; - } - - -} - diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index f475d7d38f..0ed6454168 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -12,7 +12,6 @@ import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; import java.util.List; -import java.util.Set; /** * @Author zxc @@ -156,5 +155,4 @@ public interface GovOrgService { */ List getStaffOrgList(String staffId); - List queryHouseInfo(Set houseIdList); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index bfa7f9f9d1..17b0fcfe8c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -532,12 +532,5 @@ public class GovOrgServiceImpl implements GovOrgService { return customerAgencyDao.getOrgList(staffId); } - @Override - public List queryHouseInfo(Set houseIdList) { - if(CollectionUtils.isEmpty(houseIdList)){ - return new ArrayList<>(); - } - return customerAgencyDao.queryHouseInfo(houseIdList); - } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/CustomerFootBarService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/CustomerFootBarService.java index a79000d974..810122f74c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/CustomerFootBarService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/CustomerFootBarService.java @@ -20,12 +20,8 @@ package com.epmet.dataaggre.service.opercustomize; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dataaggre.dto.app.form.AppFootBarFormDTO; import com.epmet.dataaggre.dto.app.result.AppFootBarResultDTO; -import com.epmet.dataaggre.dto.epmetuser.IcFormResColumnDTO; import com.epmet.dataaggre.entity.opercustomize.CustomerFootBarEntity; -import java.util.List; -import java.util.Set; - /** * APP底部菜单栏信息 * @@ -44,9 +40,4 @@ public interface CustomerFootBarService extends BaseService queryConditions(String customerId, String formCode); - - List querySubTables(String customerId, String formCode); - - Set queryIcResiSubTables(String customerId, String formCode); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/CustomerFootBarServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/CustomerFootBarServiceImpl.java index 0aefa94d84..d301e23b16 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/CustomerFootBarServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/CustomerFootBarServiceImpl.java @@ -114,19 +114,4 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl queryConditions(String customerId, String formCode) { - return baseDao.queryConditions(customerId,formCode); - } - - @Override - public List querySubTables(String customerId, String formCode) { - return baseDao.querySubTables(customerId,formCode); - } - - @Override - public Set queryIcResiSubTables(String customerId, String formCode) { - return baseDao.queryIcResiSubTables(customerId,formCode); - } - } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml deleted file mode 100644 index df1b389d0a..0000000000 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index f7466eb235..7a0760d0a3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -286,26 +286,4 @@ AND USER_ID = #{staffId} - diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/CustomerFootBarDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/CustomerFootBarDao.xml index 11a8d52f7c..51340127fc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/CustomerFootBarDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/CustomerFootBarDao.xml @@ -39,54 +39,4 @@ AND C.DISPLAY='1' - - - - - \ No newline at end of file