优化警务微信和短信通知

mailbox-lan/src/main/java/com/biutag/lan/service/PoliceWeChatMessage.java

@@ -40,10 +40,14 @@ public class PoliceWeChatMessage {
         List<PoliceUser> policeUsers = policeUserMapper.selectList(new LambdaQueryWrapper<PoliceUser>()
                 .eq(PoliceUser::getRoleIds, roleId)
                 .eq(PoliceUser::getDataDeptId, deptId));
-        policeUsers.stream()
-                .filter(item -> IdcardUtil.isValidCard(item.getIdCode())).forEach(item -> {
-                    log.info("通过警务微信给[{}]，发送：{}", item.getIdCode(), content);
-                    PoliceWeChatUtil.send(item.getIdCode(), content);
+        List<Duty> dutys = dataScreenMapper.getToFjDuty(null, deptId);
+        try {
+            dutys.stream().filter(item -> PhoneUtil.isPhone(item.getMobile()))
+                    .forEach(item -> {
+                        SmsSend smsSend = new SmsSend().setPhone(item.getMobile())
+                                .setContent(content)
+                                .setSuccess(false).setCreateTime(LocalDateTime.now());
+                        smsSendMapper.insert(smsSend);
                         Notice notice = new Notice()
                                 .setContent(content)
                                 .setRoleId(roleId)
@@ -51,17 +55,16 @@ public class PoliceWeChatMessage {
                                 .setEmpNo(item.getEmpNo())
                                 .setCreateTime(LocalDateTime.now())
                                 .setReadFlag(AppConstants.N)
-                            .setType(NoticeType.police_wechat.name());
+                                .setType(NoticeType.sms.name());
                         noticeMapper.insert(notice);
-
                     });
-        List<Duty> dutys = dataScreenMapper.getToFjDuty(null, deptId);
-        dutys.stream().filter(item -> PhoneUtil.isPhone(item.getMobile()))
-            .forEach(item -> {
-                SmsSend smsSend = new SmsSend().setPhone(item.getMobile())
-                        .setContent(content)
-                        .setSuccess(false).setCreateTime(LocalDateTime.now());
-                smsSendMapper.insert(smsSend);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        policeUsers.stream()
+                .filter(item -> IdcardUtil.isValidCard(item.getIdCode())).forEach(item -> {
+                    log.info("通过警务微信给[{}]，发送：{}", item.getIdCode(), content);
+                    PoliceWeChatUtil.send(item.getIdCode(), content);
                     Notice notice = new Notice()
                             .setContent(content)
                             .setRoleId(roleId)
@@ -69,10 +72,12 @@ public class PoliceWeChatMessage {
                             .setEmpNo(item.getEmpNo())
                             .setCreateTime(LocalDateTime.now())
                             .setReadFlag(AppConstants.N)
-                        .setType(NoticeType.sms.name());
+                            .setType(NoticeType.police_wechat.name());
                     noticeMapper.insert(notice);
+
         });
 
+
     }
 
 }