From 373afeff46b7372a94dfc14831400b1b625ed0c2 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 4 Jul 2022 15:47:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3-=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 6 +++--- .../com/jero/modules/project/util/SendMessageUtils.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 54f454305..174dbebf2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1616,7 +1616,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList, String content, String contentInfo) { + private SysAnnouncement getSysAnnouncement(List userIdList, String content, String contentInfo, MessageTypeEnum messageType) { SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); sysAnnouncement.setSendStatus("0"); sysAnnouncement.setSendTime(new Date()); - sysAnnouncement.setMsgCategory(MessageTypeEnum.READ.getValue());//消息类型 + sysAnnouncement.setMsgCategory(messageType.getValue());//消息类型 sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 sysAnnouncement.setMsgContent(content); sysAnnouncement.setMsgContentInfo(contentInfo); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java index 89e3181d2..863451a73 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java @@ -69,7 +69,7 @@ public class SendMessageUtils { String contentInfo = (String) sendMessageMap.get("contentInfo"); //系统消息 - SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgContent, contentInfo); + SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgContent, contentInfo,messageType); sysAnnouncementService.saveAnnouncement(sysAnnouncement); sendWebsocket(idTemp, idTemp); @@ -89,12 +89,12 @@ public class SendMessageUtils { } @NotNull - private static SysAnnouncement getSysAnnouncement(List userIdList, String content, String contentInfo) { + private static SysAnnouncement getSysAnnouncement(List userIdList, String content, String contentInfo, MessageTypeEnum messageType) { SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); sysAnnouncement.setSendStatus("0"); sysAnnouncement.setSendTime(new Date()); - sysAnnouncement.setMsgCategory(MessageTypeEnum.READ.getValue());//消息类型 + sysAnnouncement.setMsgCategory(messageType.getValue());//消息类型 sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 sysAnnouncement.setMsgContent(content); sysAnnouncement.setMsgContentInfo(contentInfo);