From 57a18004da1bb375be115602d07e033823b2b3a7 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Fri, 20 Mar 2026 15:05:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=BE=85=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/fire/check/command/FireCheckListAddExe.java | 10 +++------- .../check/command/query/FireCheckListQueryExe.java | 9 ++------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java index 837b988..27d1c62 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java @@ -83,11 +83,7 @@ public class FireCheckListAddExe { }); //TODO 消息提醒 try{ - List userDOList = userRepository.getListById(cmd.getUserIdList()); - Map userNameMap = userDOList.stream() - .collect(Collectors.toMap( - UserDO::getId, - UserDO::getName)); + List todoListAddEventList = new ArrayList<>(); cmd.getUserIdList().forEach(userId -> { MessageSendCmd messageSendCmd = new MessageSendCmd(); @@ -106,8 +102,8 @@ public class FireCheckListAddExe { log.info("创建清单,超期提醒发送消息结果:d: {}", JSONUtil.toJsonStr(d)); //待排查 待办 TodoListAddEvent event = new TodoListAddEvent(); - event.setTitle(userNameMap.get(userId) + "-待排查"); - event.setContent("您有一条[" + cmd.getFireCheckName() + "(" + cmd.getFireCheckTypeName() + ")】待检查，请您及时排查，避免超期。"); + event.setTitle("您有一条【消防检查】待处理"); + event.setContent("待排查"); event.setForeignKey(fireCheckListE.getId()); // 业务表ID -申请 event.setForeignSubsidiaryKey(fireCheckListE.getId()); // 业务附表ID 没有附表时为foreignKey的值 event.setReceiveUser(userId);// user表ID diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java index d0cd23c..36b8bf3 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java @@ -615,11 +615,6 @@ public class FireCheckListQueryExe { continue; } try { - List userDOList = userRepository.getListById(fireCheckListUserDONameMap.get(info.getFireCheckId())); - Map userNameMap = userDOList.stream() - .collect(Collectors.toMap( - UserDO::getId, - UserDO::getName)); List todoListAddEventList = new ArrayList<>(); for (Long userId : fireCheckListUserDONameMap.get(info.getFireCheckId())) { MessageSendCmd messageSendCmd = new MessageSendCmd(); @@ -639,8 +634,8 @@ public class FireCheckListQueryExe { //待排查 待办 TodoListAddEvent event = new TodoListAddEvent(); - event.setTitle(userNameMap.get(userId) + "-待排查"); - event.setContent("您有一条[" + info.getFireCheckName() + "(" + info.getFireCheckTypeName() + ")】待检查，请您及时排查，避免超期。"); + event.setTitle("您有一条【消防检查】待处理"); + event.setContent("待排查"); event.setForeignKey(info.getId()); // 业务表ID -申请 event.setForeignSubsidiaryKey(info.getId()); // 业务附表ID 没有附表时为foreignKey的值 event.setReceiveUser(userId);// user表ID