From fdebfa4b9d650a37ef0941a39783c32aece14584 Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Sat, 7 Dec 2024 17:06:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AD=A6=E5=8A=A1=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E5=92=8C=E7=9F=AD=E4=BF=A1=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lan/service/PoliceWeChatMessage.java      | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/PoliceWeChatMessage.java b/mailbox-lan/src/main/java/com/biutag/lan/service/PoliceWeChatMessage.java
index 3f2fef1..7797332 100644
--- a/mailbox-lan/src/main/java/com/biutag/lan/service/PoliceWeChatMessage.java
+++ b/mailbox-lan/src/main/java/com/biutag/lan/service/PoliceWeChatMessage.java
@@ -40,6 +40,27 @@ public class PoliceWeChatMessage {
         List<PoliceUser> policeUsers = policeUserMapper.selectList(new LambdaQueryWrapper<PoliceUser>()
                 .eq(PoliceUser::getRoleIds, roleId)
                 .eq(PoliceUser::getDataDeptId, deptId));
+        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)
+                                .setDeptId(deptId)
+                                .setEmpNo(item.getEmpNo())
+                                .setCreateTime(LocalDateTime.now())
+                                .setReadFlag(AppConstants.N)
+                                .setType(NoticeType.sms.name());
+                        noticeMapper.insert(notice);
+                    });
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
         policeUsers.stream()
                 .filter(item -> IdcardUtil.isValidCard(item.getIdCode())).forEach(item -> {
                     log.info("通过警务微信给[{}]，发送：{}", item.getIdCode(), content);
@@ -55,23 +76,7 @@ public class PoliceWeChatMessage {
                     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);
-                Notice notice = new Notice()
-                        .setContent(content)
-                        .setRoleId(roleId)
-                        .setDeptId(deptId)
-                        .setEmpNo(item.getEmpNo())
-                        .setCreateTime(LocalDateTime.now())
-                        .setReadFlag(AppConstants.N)
-                        .setType(NoticeType.sms.name());
-                noticeMapper.insert(notice);
-            });
+
 
     }