操作记录，脱敏记录targetId

epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/CheckAndExportOperationLogListener.java

@@ -1,10 +1,8 @@
 package com.epmet.mq.listener.listener;
 
 import com.alibaba.fastjson.JSON;
-import com.epmet.auth.constants.AuthOperationEnum;
 import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.epmet.commons.rocketmq.messages.CheckMQMsg;
-import com.epmet.commons.rocketmq.messages.LoginMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
@@ -69,7 +67,7 @@ public class CheckAndExportOperationLogListener implements MessageListenerConcur
         logEntity.setIp(msgObj.getIp());
         logEntity.setFromApp(msgObj.getFromApp());
         logEntity.setFromClient(msgObj.getFromClient());
-        logEntity.setTargetId("");
+        logEntity.setTargetId(msgObj.getTargetId());
         logEntity.setCustomerId(operatorInfo.getCustomerId());
         logEntity.setOperatorId(msgObj.getUserId());
         logEntity.setOperatorName(operatorInfo.getName());

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CheckMQMsg.java

@@ -29,5 +29,5 @@ public class CheckMQMsg {
     private String fromClient;
     private String orgId;
     private String orgIdPath;
-
+    private String targetId;
 }

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

@@ -1023,6 +1023,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             result.setMobile(houseInfo.getOwnerPhone());
             result.setIdCard(houseInfo.getOwnerIdCard());
             msg.setContent("查看"+houseInfo.getAllName()+"房屋的敏感信息");
+            msg.setTargetId(formDTO.getId());
         }else if (formDTO.getType().equals(NeighborhoodConstant.CHECK_IC_RESI_USER)){
             IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId());
             if (null == icResiUserInfo){
@@ -1031,14 +1032,16 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             result.setIdCard(icResiUserInfo.getIdCard());
             result.setMobile(icResiUserInfo.getMobile());
             msg.setContent("查看"+icResiUserInfo.getName()+"的敏感信息");
+            msg.setTargetId(formDTO.getId());
         }else if (formDTO.getType().equals(NeighborhoodConstant.JMFYXX)){
             IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId());
             if (null == icResiUserInfo){
-                throw new EpmetException("查询icResiUser失败："+formDTO.getId());
+                throw new EpmetException("居民防疫信息查询icResiUser失败："+formDTO.getId());
             }
             result.setIdCard(icResiUserInfo.getIdCard());
             result.setMobile(icResiUserInfo.getMobile());
             msg.setContent("查看"+icResiUserInfo.getName()+"的敏感信息(居民防疫信息)");
+            msg.setTargetId(formDTO.getId());
         }else if (formDTO.getType().equals(NeighborhoodConstant.ROUTE_FOLLOW)){
             Map<String, String> info = icResiUserDao.getTripReportRecordInfo(formDTO.getId());
             if (null == info){
@@ -1047,6 +1050,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
             result.setMobile(info.get(NeighborhoodConstant.MOBILE));
             msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(行程随访)");
+            msg.setTargetId(formDTO.getId());
         }else if (formDTO.getType().equals(NeighborhoodConstant.VACCINATION_RECORD)){
             Map<String, String> info = icResiUserDao.getVaccineRecordInfo(formDTO.getId());
             if (null == info){
@@ -1055,6 +1059,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
             result.setMobile(info.get(NeighborhoodConstant.MOBILE));
             msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(疫苗接种记录)");
+            msg.setTargetId(formDTO.getId());
         }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)){
@@ -1078,7 +1083,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
                 default:
             }
             msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息("+cMsg+")");
-
+            msg.setTargetId(formDTO.getId());
         }else if (formDTO.getType().equals(NeighborhoodConstant.NO_NAT_COMPARE)){
             Map<String, String> info = icResiUserDao.getNoNatCompareInfo(formDTO.getId());
             if (null == info){
@@ -1087,6 +1092,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
             result.setMobile(info.get(NeighborhoodConstant.MOBILE));
             msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(未做核酸比对)");
+            msg.setTargetId(formDTO.getId());
         }else if (formDTO.getType().equals(NeighborhoodConstant.NAT_RECORD)){
             Map<String, String> info = icResiUserDao.getNatInfo(formDTO.getId());
             if (null == info){
@@ -1095,6 +1101,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
             result.setMobile(info.get(NeighborhoodConstant.MOBILE));
             msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(核酸检测信息)");
+            msg.setTargetId(formDTO.getId());
         }else if (formDTO.getType().equals(NeighborhoodConstant.EMPLOYEE_EPIDEMIC_MANAGE_DETAIL)){
             Map<String, String> info = govOrgService.getEmployeeRegisterMobileAndIdCard(formDTO.getId());
             if (null == info){
@@ -1103,6 +1110,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             result.setIdCard(info.get(NeighborhoodConstant.ID_CARD));
             result.setMobile(info.get(NeighborhoodConstant.MOBILE));
             msg.setContent("查看"+info.get(NeighborhoodConstant.NAME)+"的敏感信息(员工登记信息)");
+            msg.setTargetId(formDTO.getId());
         }
         // 发送mq消息
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();