明文查看

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java

@@ -30,6 +30,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户基础信息
@@ -138,4 +139,14 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                     @Param("agencyId")String agencyId,
                                                     @Param("staffOrgIds")String staffOrgIds,
                                                     @Param("search")String search);
+
+    Map<String,String> getTripReportRecordInfo(@Param("id")String id);
+
+    Map<String,String> getVaccineRecordInfo(@Param("id")String id);
+
+    Map<String,String> getSpecialAttentionInfo(@Param("id")String id);
+
+    Map<String,String> getNoNatCompareInfo(@Param("id")String id);
+
+    Map<String,String> getNatInfo(@Param("id")String id);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -997,6 +997,10 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         String customerId = tokenDto.getCustomerId();
         String userId = tokenDto.getUserId();
         CheckMQMsg msg = new CheckMQMsg();
+        IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId());
+        if (null == icResiUserInfo){
+            throw new EpmetException("查询icResiUser失败："+formDTO.getId());
+        }
         if (formDTO.getType().equals(NeighborhoodConstant.HOUSE)){
             HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(customerId, formDTO.getId());
             if (null == houseInfo){
@@ -1005,22 +1009,76 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             result.setMobile(houseInfo.getOwnerPhone());
             result.setIdCard(houseInfo.getOwnerIdCard());
             msg.setContent("查看"+houseInfo.getAllName()+"房屋的敏感信息");
-            msg.setType("checkHouse");
-            msg.setTypeDisplay("查看"+houseInfo.getAllName()+"房屋的敏感信息");
         }else if (formDTO.getType().equals(NeighborhoodConstant.IC_RESI_USER)){
-            IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId());
-            if (null == icResiUserInfo){
-                throw new EpmetException("查询icResiUser失败："+formDTO.getId());
-            }
             result.setIdCard(icResiUserInfo.getIdCard());
             result.setMobile(icResiUserInfo.getMobile());
             msg.setContent("查看"+icResiUserInfo.getName()+"的敏感信息");
-            msg.setType("checkIcResiUser");
+        }else if (formDTO.getType().equals(NeighborhoodConstant.JMFYXX)){
-            msg.setTypeDisplay("查看"+icResiUserInfo.getName()+"的敏感信息");
+            result.setIdCard(icResiUserInfo.getIdCard());
+            result.setMobile(icResiUserInfo.getMobile());
+            msg.setContent("查看"+icResiUserInfo.getName()+"的敏感信息(居民防疫信息)");
+        }else if (formDTO.getType().equals(NeighborhoodConstant.ROUTE_FOLLOW)){
+            Map<String, String> info = icResiUserDao.getTripReportRecordInfo(formDTO.getId());
+            if (null == info){
+                throw new EpmetException("未查询到行程随访信息："+formDTO.getId());
+            }
+            result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
+            result.setMobile(info.get(NeighborhoodConstant.MOBILE));
+            msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(行程随访)");
+        }else if (formDTO.getType().equals(NeighborhoodConstant.VACCINATION_RECORD)){
+            Map<String, String> info = icResiUserDao.getVaccineRecordInfo(formDTO.getId());
+            if (null == info){
+                throw new EpmetException("未查询到疫苗接种信息："+formDTO.getId());
+            }
+            result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
+            result.setMobile(info.get(NeighborhoodConstant.MOBILE));
+            msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(疫苗接种记录)");
+        }else if (formDTO.getType().equals(NeighborhoodConstant.VACCINE_SPECIAL_ATTENTION)
+        || formDTO.getType().equals(NeighborhoodConstant.FOCUS_GROUP_SPECIAL_ATTENTION_QUARANTINE)
+        || formDTO.getType().equals(NeighborhoodConstant.FOCUS_GROUP_SPECIAL_ATTENTION_HISTORY)){
+            Map<String, String> info = icResiUserDao.getSpecialAttentionInfo(formDTO.getId());
+            if (null == info){
+                throw new EpmetException("未查询到特别关注名单信息："+formDTO.getId());
+            }
+            result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
+            result.setMobile(info.get(NeighborhoodConstant.MOBILE));
+            String cMsg = "";
+            switch (formDTO.getType()){
+                case NeighborhoodConstant.VACCINE_SPECIAL_ATTENTION:
+                    cMsg = "疫苗接种关注名单";
+                    break;
+                case NeighborhoodConstant.FOCUS_GROUP_SPECIAL_ATTENTION_QUARANTINE:
+                    cMsg = "重点人群关注名单(防疫隔离)";
+                    break;
+                case NeighborhoodConstant.FOCUS_GROUP_SPECIAL_ATTENTION_HISTORY:
+                    cMsg = "重点人群关注名单(历史记录)";
+                    break;
+                default:
+            }
+            msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息("+cMsg+")");
+
+        }else if (formDTO.getType().equals(NeighborhoodConstant.NO_NAT_COMPARE)){
+            Map<String, String> info = icResiUserDao.getNoNatCompareInfo(formDTO.getId());
+            if (null == info){
+                throw new EpmetException("未查询到未做核酸比对信息："+formDTO.getId());
+            }
+            result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
+            result.setMobile(info.get(NeighborhoodConstant.MOBILE));
+            msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(未做核酸比对)");
+        }else if (formDTO.getType().equals(NeighborhoodConstant.NAT_RECORD)){
+            Map<String, String> info = icResiUserDao.getNatInfo(formDTO.getId());
+            if (null == info){
+                throw new EpmetException("未查询到核酸检测信息："+formDTO.getId());
+            }
+            result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
+            result.setMobile(info.get(NeighborhoodConstant.MOBILE));
+            msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(核酸检测信息)");
         }
         // 发送mq消息
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         msg.setOperateTime(new Date());
+        msg.setType(formDTO.getType());
+        msg.setTypeDisplay(msg.getContent());
         msg.setUserId(userId);
         msg.setFromApp(tokenDto.getApp());
         msg.setIp(IpUtils.getIpAddr(request));

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -283,4 +283,42 @@
         having volunteerCategory is null
             or volunteerCategory = ''
     </select>
+
+    <select id="getTripReportRecordInfo" resultType="java.util.Map">
+        select
+            MOBILE,
+            ID_CARD
+        from ic_trip_report_record
+        where id = #{id}
+    </select>
+    <select id="getVaccineRecordInfo" resultType="java.util.Map">
+        select
+            MOBILE,
+            ID_CARD
+        from ic_vaccine
+        where id = #{id}
+    </select>
+
+    <select id="getVaccineSpecialAttentionInfo" resultType="java.util.Map">
+        select
+            MOBILE,
+            ID_CARD
+        from ic_epidemic_special_attention
+        where id = #{id}
+    </select>
+
+    <select id="getNoNatCompareInfo" resultType="java.util.Map">
+        select
+            MOBILE,
+            ID_CARD
+        from ic_nat_compare_record
+        where id = #{id}
+    </select>
+    <select id="getNatInfo" resultType="java.util.Map">
+        select
+            MOBILE,
+            ID_CARD
+        from ic_nat
+        where id = #{id}
+    </select>
 </mapper>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/NeighborhoodConstant.java

@@ -6,12 +6,59 @@ package com.epmet.constant;
  */
 public interface NeighborhoodConstant {
 
+    String MOBILE = "MOBILE";
+    String ID_CARD = "ID_CARD";
+    String NAME = "NAME";
+
     String GRID = "grid";
 
     String  NEIGHBOR_HOOD= "neighbourHood";
     String BUILDING = "building";
     String HOUSE = "house";
 
+    /**
+     * ic居民
+     */
     String IC_RESI_USER = "icResiUser";
 
+    /**
+     * 居民防疫信息
+     */
+    String JMFYXX = "JMFYXX";
+
+    /**
+     * 行程随访
+     */
+    String ROUTE_FOLLOW = "routeFollow";
+
+    /**
+     * 疫苗接种记录
+     */
+    String VACCINATION_RECORD = "vaccinationRecord";
+
+    /**
+     * 疫苗接种关注名单
+     */
+    String VACCINE_SPECIAL_ATTENTION = "vaccineSpecialAttention";
+
+    /**
+     * 未做核酸比对
+     */
+    String NO_NAT_COMPARE = "noNatCompare";
+
+    /**
+     * 核酸检测记录
+     */
+    String NAT_RECORD = "natRecord";
+
+    /**
+     * 重点人群关注名单【防疫隔离】
+     */
+    String FOCUS_GROUP_SPECIAL_ATTENTION_QUARANTINE = "focusGroupSpecialAttentionQuarantine";
+
+    /**
+     * 重点人群关注名单【历史记录】
+     */
+    String FOCUS_GROUP_SPECIAL_ATTENTION_HISTORY = "focusGroupSpecialAttentionHistory";
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java

@@ -30,6 +30,9 @@ public class IcNatCompareRecordDTO implements Serializable {
     @ExcelIgnore
     private String relationId;
 
+    @ExcelIgnore
+    private String recordId;
+
     /**
      * 姓名
      */

epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml

@@ -7,6 +7,7 @@
     <select id="pageList" parameterType="com.epmet.dto.form.yqfk.IcNatCompareRecordPageFormDTO" resultType="com.epmet.dto.IcNatCompareRecordDTO">
         SELECT
             r.ID as relationId,
+            c.ID as recordId,
             c.MOBILE,
             c.ID_CARD,
             c.`NAME`,