From bfef176b333b55f659d1b65fed7b169473e6f21d Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 2 Apr 2022 16:30:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=B1=85=E6=B0=91=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=98=E5=8A=A8=20=E5=A6=82=E6=9E=9C=E6=98=AF?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=88=96=E8=80=85=E6=96=B0=E5=A2=9E=20?= =?UTF-8?q?=E5=88=99=E6=9B=B4=E6=96=B0=E6=98=AF=E5=90=A6=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IcNatDao.java | 11 ++++++ .../java/com/epmet/dao/IcResiUserDao.java | 35 +++++++++++-------- .../mq/listener/ICWarnStatsEventListener.java | 25 +++++++++++++ .../java/com/epmet/service/IcNatService.java | 8 +++++ .../epmet/service/impl/IcNatServiceImpl.java | 10 +++++- .../src/main/resources/mapper/IcNatDao.xml | 17 +++++++++ .../main/resources/mapper/IcResiUserDao.xml | 3 ++ 7 files changed, 93 insertions(+), 16 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java index adaa191b1a..5496919f3c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java @@ -46,6 +46,7 @@ public interface IcNatDao extends BaseDao { /** * 插入或者更新 + * * @param e */ void insertOrUpdate(IcNatEntity e); @@ -55,4 +56,14 @@ public interface IcNatDao extends BaseDao { * @Description 按条件查询业务数据 **/ IcNatDTO getNatDTO(@Param("customerId") String customerId, @Param("icNatId") String icNatId, @Param("idCard") String idCard, @Param("natTime") String natTime, @Param("natResult") String natResult); + + /** + * desc:根据客户id 更新是否居民状态 + * + * @param customerId + * @param icResiUserId 如果为空则更新全部 + * @return + */ + int updateIsResiFlag(@Param("customerId") String customerId, @Param("icResiUserId") String icResiUserId); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index c6e23272e5..f5ebf8ac51 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -54,15 +54,16 @@ public interface IcResiUserDao extends BaseDao { **/ void upTable(@Param("tableName") String tableName, @Param("id") String id, @Param("map") Map map); - List> selectListResiMap(@Param("customerId") String customerId, - @Param("formCode") String formCode, - @Param("conditions") List conditions, - @Param("resultColumns") List resultColumns, - @Param("subTables") List subTables, - @Param("currentStaffAgencyId")String currentStaffAgencyId, - @Param("staffOrgPath") String staffOrgPath, - @Param("resultTableName")String resultTableName, - @Param("keyword") String keyword); + List> selectListResiMap(@Param("customerId") String customerId, + @Param("formCode") String formCode, + @Param("conditions") List conditions, + @Param("resultColumns") List resultColumns, + @Param("subTables") List subTables, + @Param("currentStaffAgencyId") String currentStaffAgencyId, + @Param("staffOrgPath") String staffOrgPath, + @Param("resultTableName") String resultTableName, + @Param("keyword") String keyword); + /** * 查询主表 * @@ -238,15 +239,15 @@ public interface IcResiUserDao extends BaseDao { List listIcResiInfosByUserIds(@Param("userIds") List userIds); - Map getCategoryListMap(@Param("columns")List columns, @Param("icUserId") String icUserId); + Map getCategoryListMap(@Param("columns") List columns, @Param("icUserId") String icUserId); Map selectResiInfoMap(@Param("idCard") String idCard, @Param("resiId") String resiId); - List> selectResiUsers(@Param("types")List types,@Param("orgId")String orgId); + List> selectResiUsers(@Param("types") List types, @Param("orgId") String orgId); List icUserCustomerIds(); - List> getIcUserList(@Param("customerId") String customerId, @Param("columns")List columns); + List> getIcUserList(@Param("customerId") String customerId, @Param("columns") List columns); /** * desc: 获取数据分析列中的 各类居民数据 @@ -254,9 +255,9 @@ public interface IcResiUserDao extends BaseDao { * @param customerId * @param tableName * @param columnList - * @param id 非必填 leve有值时 必填 - * @param level 非必填 - * @return java.util.Map 字段名：数量 + * @param id 非必填 leve有值时 必填 + * @param level 非必填 + * @return java.util.Map 字段名：数量 * @author LiuJanJun * @date 2022/2/12 3:03 下午 */ @@ -265,6 +266,7 @@ public interface IcResiUserDao extends BaseDao { /** * Desc: 根据房屋IDs查询房屋下是否有存在居民的 + * * @param ids * @author zxc * @date 2022/3/2 10:32 上午 @@ -273,6 +275,7 @@ public interface IcResiUserDao extends BaseDao { /** * 居民防疫信息查询 + * * @Param formDTO * @Return {@link List< EpidemicPreventionResultDTO>} * @Author zhaoqifeng @@ -281,6 +284,8 @@ public interface IcResiUserDao extends BaseDao { List getEpidemicPreventionList(EpidemicPreventionFormDTO formDTO); List natList(EpidemicPreventionFormDTO formDTO); + List vaccineList(EpidemicPreventionFormDTO formDTO); + IcResiUserEntity selectResiNoDelFlag(@Param("icResiUserId") String icResiUserId); } 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 9901fe8215..ee9c4e47b3 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 @@ -9,6 +9,8 @@ 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 com.epmet.constant.SystemMessageType; +import com.epmet.service.IcNatService; import com.epmet.service.StatsResiWarnService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -71,6 +73,9 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently { 30L, 30L, TimeUnit.SECONDS); //待执行方法 SpringContextUtils.getBean(StatsResiWarnService.class).resiWarn(obj.getCustomerId()); + //根据居民Id更新 核酸检测的是否居民状态 + updateIcNatResiFlag(tags, obj); + } catch (RenException e) { // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 logger.error("【开放数据事件监听器】-客户居民信息变动MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e))); @@ -91,6 +96,26 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently { } } + /** + * desc:根据居民Id更新 核酸检测的是否居民状态(只有新增和删除时调用) + * @param tags + * @param obj + */ + private void updateIcNatResiFlag(String tags, IcResiUserAddMQMsg obj) { + try { + if (StringUtils.isBlank(obj.getCustomerId())||StringUtils.isBlank(obj.getIcResiUser())){ + log.warn("updateIcNatResiFlag param is error"); + return; + } + if (SystemMessageType.IC_RESI_USER_ADD.equals(tags) || SystemMessageType.IC_RESI_USER_DEL.equals(tags)) { + Integer effectRow = SpringContextUtils.getBean(IcNatService.class).updateIsResiFlag(obj.getCustomerId(), obj.getIcResiUser()); + log.debug("updateIcNatResiFlag effectRow:{},param customerId & icResiUserId:{}", effectRow, JSON.toJSONString(obj)); + } + } catch (Exception e) { + log.error("updateIcNatResiFlag exception", e); + } + } + /** * @description * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNatService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNatService.java index 450bee8592..ea75c911e4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNatService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNatService.java @@ -84,4 +84,12 @@ public interface IcNatService extends BaseService { * @Date 2022/3/29 16:29 */ List getNatList(String customerId, String idCard); + + /** + * desc:根据用户id 更新核酸中是否居民状态 + * @param customerId + * @param icResiUserId 如果为空则更新全部 + * @return + */ + Integer updateIsResiFlag(String customerId, String icResiUserId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 3ac01d40ff..abb8f6184c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -24,7 +24,10 @@ import com.epmet.dao.IcResiUserDao; import com.epmet.dao.UserBaseInfoDao; import com.epmet.dto.IcNatDTO; import com.epmet.dto.IcNoticeDTO; -import com.epmet.dto.form.*; +import com.epmet.dto.form.AddIcNatFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.form.MyNatListFormDTO; +import com.epmet.dto.form.SendNoticeFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcNatEntity; import com.epmet.entity.IcNatRelationEntity; @@ -435,6 +438,11 @@ public class IcNatServiceImpl extends BaseServiceImpl imp }).collect(Collectors.toList()); } + @Override + public Integer updateIsResiFlag(String customerId, String icResiUserId) { + return baseDao.updateIsResiFlag(customerId,icResiUserId); + } + /** * 批量持久化 * @param entities diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml index 16b5e20990..8392bf5856 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml @@ -156,4 +156,21 @@ UPDATED_BY=#{updatedBy}, UPDATED_TIME=NOW() + + UPDATE ic_nat m, + ( + SELECT if(DEL_FLAG,0,1) resiFlag, ID_CARD FROM ic_resi_user + WHERE + 1=1 + + AND ID = #{icResiUserId} + + AND CUSTOMER_ID = #{customerId} + AND DEL_FLAG = '0' + ) t + SET m.IS_RESI_USER = t.resiFlag + WHERE + m.ID_CARD = t.ID_CARD + AND m.DEL_FLAG = '0' + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 03e32c884a..b3fef04dbc 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -797,4 +797,7 @@ ORDER BY `NAME` +