消息类型

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -315,7 +315,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 //            String contentInfo = sysUser.getUsername() + " delete " + sbStr + ",Please pay attention to check.";
             String contentInfo =content;
             //封装消息的实体类
-            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
+            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue());
             sysAnnouncementService.saveAnnouncement(sysAnnouncement);
             sendWebsocket(StringUtils.join(serialNumberList, ","), contentInfo);
         }
@@ -2149,7 +2149,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     + href +" has been updated.";
 //            String contentInfo = sysUser.getUsername() + " add " + serialNumber + ",Please pay attention to check.";
             //封装消息的实体类
-            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
+            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue());
             sysAnnouncementService.saveAnnouncement(sysAnnouncement);
             sendWebsocket(idTemp, contentInfo);
             //飞书
@@ -3150,7 +3150,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 String contentInfo = "In the " + technologyTerritoryNameEn + " technical field you subscribed to," +sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
 //                String contentInfo = "In the "+category + " " + href+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
                 //封装消息的实体类
-                SysAnnouncement sysAnnouncement = getSysAnnouncement(userList, contentInfoFei, contentInfo);
+                SysAnnouncement sysAnnouncement = getSysAnnouncement(userList, contentInfoFei, contentInfo,MessageTypeEnum.READ.getValue());
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                 sendWebsocket((String) map.get("id"), contentInfo);
             }
@@ -3171,7 +3171,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 content = "In the "+category + " " + serialNumber+" you subscribed to, has been modified,Please pay attention to check.";
                 String contentInfo = "In the "+category + " " + href+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
                 //封装消息的实体类
-                SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, content, contentInfo);
+                SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, content, contentInfo,MessageTypeEnum.READ.getValue());
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                 sendWebsocket((String) map.get("id"), contentInfo);
             }
@@ -3251,7 +3251,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         String content = "New numbering implemented, please note update status of alternate numbering " + StringUtils.join(serialNumberList, ",");
         String contentInfo = "New numbering implemented, please note update status of alternate numbering " + sbStr;
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
+        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         sendWebsocket(StringUtils.join(serialNumberListTemp, ","), contentInfo);
         //飞书
@@ -3274,13 +3274,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
 
     @NotNull
-    public SysAnnouncement getSysAnnouncement(List<String> userIdList, String content, String contentInfo) {
+    public SysAnnouncement getSysAnnouncement(List<String> userIdList, String content, String contentInfo,String messageType) {
         SysAnnouncement sysAnnouncement = new SysAnnouncement();
         sysAnnouncement.setDelFlag("0");
         sysAnnouncement.setSendStatus("0");
         sysAnnouncement.setSendTime(new Date());
 //            sysAnnouncement.setDocumentId((String) dataList.get(0).get("id"));
-        sysAnnouncement.setMsgCategory(MessageTypeEnum.READ.getValue());//消息类型
+        sysAnnouncement.setMsgCategory(messageType);//消息类型
         sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户
         sysAnnouncement.setMsgContent(content);
         sysAnnouncement.setMsgContentInfo(contentInfo);
@@ -4740,7 +4740,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you. Please be reminded to check it out.";
         String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out.";
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
+        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.PUSH.getValue());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo);
         //飞书

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java

@@ -1147,7 +1147,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     contentInfo = setContentInfo(contentInfo, baseDiff,contentLog);
                     contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff,contentLog).replace("</br>"," ");
                     //封装消息的实体类
-                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
+                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue());
                     sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                     bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
                     //飞书
@@ -1161,7 +1161,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     contentInfo = "Please note that the "+baseName+" virtual list you subscribed to has been withdrawn.";
 
                     //封装消息的实体类
-                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
+                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue());
                     sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                     bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
                     //飞书

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java

@@ -333,7 +333,7 @@ public class LawsWarnService {
         String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you. Please be reminded to check it out.";
         String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out.";
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
+        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.PUSH.getValue());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo);
         //飞书

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java

@@ -150,7 +150,7 @@ public class TimedTaskWarn implements Job {
     private void sendMessage(String content,String contentInfo,String contentFeiShu, String url, List<String> userIdList, List<String> thirdIdList) {
         //站内消息
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
+        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.WARN.getValue());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(userIdList, ","), content);