发送通知修改

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java

@@ -18,10 +18,6 @@ import java.util.List;
 @Data
 public class SendNoticeFormDTO implements Serializable {
     private static final long serialVersionUID = 4800907725063604885L;
-    /**
-     * 单独点击发送通知按钮：send_button
-     */
-    // private String sendOrigin;
     private String customerId;
     private String staffId;
     /**

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

@@ -145,14 +145,9 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
             entity.setOrigin(formDTO.getOrigin());
             entity.setUserId(item.getUserId());
             entity.setMobile(item.getMobile());
-            /*if (StringUtils.isNotBlank(formDTO.getSendOrigin()) && "send_button".equals(formDTO.getSendOrigin())) {
-                entity.setIdCard(item.getRealIdCard());
-            } else {
-                entity.setIdCard(item.getIdCard());
-            }*/
             entity.setIdCard(item.getIdCard());
             entity.setOrgName(finalOrgName);
-            // 发送结果：1成功,0失败
+            // 发送结果：1成功,0失败 默认插入发送成功。下面没有找到居民端的用户id,会更新
             entity.setSendRes(NumConstant.ONE_STR);
             return entity;
         }).collect(Collectors.toList());
@@ -165,44 +160,45 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
 
         entityList.forEach(item -> {
             if (StringUtils.isNotBlank(item.getIdCard())) {
-                //根据身份证获取居民ID
+                //根据身份证获取居民ID 如果一个客户下，存在多个身份证号相同的而用户，该接口只返回一个
                 List<UserBaseInfoDTO> userList = userBaseInfoService.getCommonIdNumUser(item.getCustomerId(), item.getIdCard());
                 if (CollectionUtils.isNotEmpty(userList)) {
-                    userList.forEach(user -> {
+                    // userList.forEach(user -> {
+                        UserBaseInfoDTO userBaseInfoDTO=userList.get(NumConstant.ZERO);
                         UserMessageFormDTO messageFormDTO = new UserMessageFormDTO();
                         messageFormDTO.setCustomerId(item.getCustomerId());
                         messageFormDTO.setApp(AppClientConstant.APP_GOV);
                         messageFormDTO.setGridId(StrConstant.STAR);
-                        messageFormDTO.setUserId(user.getUserId());
+                        messageFormDTO.setUserId(userBaseInfoDTO.getUserId());
                         messageFormDTO.setTitle("您有一条通知消息！");
                         messageFormDTO.setMessageContent(item.getContent());
                         messageFormDTO.setReadFlag(Constant.UNREAD);
                         messageFormDTO.setMessageType(UserMessageTypeConstant.ANTIEPIDEMIC);
                         messageFormDTO.setTargetId(item.getId());
                         msgList.add(messageFormDTO);
-                    });
+                        item.setUserId(userBaseInfoDTO.getUserId());
+                    // });
                 }else{
                     // 没有找到居民端的用户id,发送失败
                     item.setSendRes(NumConstant.ZERO_STR);
-                    baseDao.updateById(item);
                 }
+                baseDao.updateById(item);
             }
             //TODO 短信消息
-            if (StringUtils.isNotBlank(item.getMobile())) {
+            /*if (StringUtils.isNotBlank(item.getMobile())) {
                 ProjectSendMsgFormDTO sms = new ProjectSendMsgFormDTO();
                 sms.setCustomerId(item.getCustomerId());
                 sms.setMobile(item.getMobile());
                 sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_OVERDUE);
                 sms.setParameterKey("send_msg");
                 smsList.add(sms);
-            }
+            }*/
         });
         //发送小程序消息
         Result result = messageFeignClient.saveUserMessageList(msgList);
         if (!result.success()) {
             log.error("发送小程序消息失败" + JSON.toJSONString(result));
         }
-        //TODO 发送短信
     }
 
     /**