防疫信息查询

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java

@@ -5,14 +5,17 @@ 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.tools.constant.*;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.ChannelEnum;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dao.IcNoticeDao;
 import com.epmet.dto.IcNoticeDTO;
+import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.form.IcNoticeFormDTO;
 import com.epmet.dto.form.ProjectSendMsgFormDTO;
 import com.epmet.dto.form.SendNoticeFormDTO;
@@ -20,6 +23,7 @@ import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.entity.IcNoticeEntity;
 import com.epmet.feign.MessageFeignClient;
 import com.epmet.service.IcNoticeService;
+import com.epmet.service.UserBaseInfoService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -44,6 +48,8 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
 
     @Resource
     private MessageFeignClient messageFeignClient;
+    @Resource
+    private UserBaseInfoService userBaseInfoService;
 
     @Override
     public PageData<IcNoticeDTO> page(IcNoticeFormDTO formDTO) {
@@ -123,8 +129,14 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
      */
     @Override
     public void sendNotice(SendNoticeFormDTO formDTO) {
+        String orgName = "";
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null != staffInfo) {
+            orgName = staffInfo.getAgencyName();
+        }
         //保存消息
         String channel = StringUtils.join(formDTO.getChannel(), StrConstant.COMMA);
+        String finalOrgName = orgName;
         List<IcNoticeEntity> entityList = formDTO.getUserList().stream().map(item -> {
             IcNoticeEntity entity = new IcNoticeEntity();
             entity.setCustomerId(formDTO.getCustomerId());
@@ -134,7 +146,7 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
             entity.setUserId(item.getUserId());
             entity.setMobile(item.getMobile());
             entity.setIdCard(item.getIdCard());
-            entity.setOrgName(formDTO.getOrgName());
+            entity.setOrgName(finalOrgName);
             return entity;
         }).collect(Collectors.toList());
         insertBatch(entityList);
@@ -145,18 +157,24 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
         List<ProjectSendMsgFormDTO> smsList = new ArrayList<>();
 
         entityList.forEach(item -> {
-            if (StringUtils.isNotBlank(item.getUserId())) {
-                UserMessageFormDTO messageFormDTO = new UserMessageFormDTO();
-                messageFormDTO.setCustomerId(item.getCustomerId());
-                messageFormDTO.setApp(AppClientConstant.APP_GOV);
-                messageFormDTO.setGridId(StrConstant.STAR);
-                messageFormDTO.setUserId(item.getUserId());
-                messageFormDTO.setTitle("您有一条通知消息！");
-                messageFormDTO.setMessageContent(item.getContent());
-                messageFormDTO.setReadFlag(Constant.UNREAD);
-                messageFormDTO.setMessageType(UserMessageTypeConstant.ANTIEPIDEMIC);
-                messageFormDTO.setTargetId(item.getId());
-                msgList.add(messageFormDTO);
+            if (StringUtils.isNotBlank(item.getIdCard())) {
+                //根据身份证获取居民ID
+                List<UserBaseInfoDTO> userList = userBaseInfoService.getCommonIdNumUser(item.getCustomerId(), item.getIdCard());
+                if (CollectionUtils.isNotEmpty(userList)) {
+                    userList.forEach(user -> {
+                        UserMessageFormDTO messageFormDTO = new UserMessageFormDTO();
+                        messageFormDTO.setCustomerId(item.getCustomerId());
+                        messageFormDTO.setApp(AppClientConstant.APP_GOV);
+                        messageFormDTO.setGridId(StrConstant.STAR);
+                        messageFormDTO.setUserId(user.getUserId());
+                        messageFormDTO.setTitle("您有一条通知消息！");
+                        messageFormDTO.setMessageContent(item.getContent());
+                        messageFormDTO.setReadFlag(Constant.UNREAD);
+                        messageFormDTO.setMessageType(UserMessageTypeConstant.ANTIEPIDEMIC);
+                        messageFormDTO.setTargetId(item.getId());
+                        msgList.add(messageFormDTO);
+                    });
+                }
             }
             //TODO 短信消息
             if (StringUtils.isNotBlank(item.getMobile())) {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1267,7 +1267,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
                 if (houseInfoMap.containsKey(item.getHomeId()) && null != houseInfoMap.get(item.getHomeId())) {
                     HouseInfoDTO houseInfoDTO = houseInfoMap.get(item.getHomeId());
-                    item.setHomeId(houseInfoDTO.getAllName());
+                    item.setHouseName(houseInfoDTO.getAllName());
                 }
             });
         }
@@ -1305,7 +1305,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             Map<String, HouseInfoDTO> houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity()));
             if (houseInfoMap.containsKey(result.getHomeId()) && null != houseInfoMap.get(result.getHomeId())) {
                 HouseInfoDTO houseInfoDTO = houseInfoMap.get(result.getHomeId());
-                result.setHomeId(houseInfoDTO.getAllName());
+                result.setHouseName(houseInfoDTO.getAllName());
             }
         }
         return result;

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

@@ -690,7 +690,7 @@
             AND MOBILE LIKE concat( '%', #{mobile}, '%' )
             </if>
             <if test="idCard != null and idCard != ''">
-            AND ID_CARD LIKE concat( '%', #{idCard}, '%' )
+            AND a.ID_CARD LIKE concat( '%', #{idCard}, '%' )
             </if>
             ) t
             WHERE