diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 6e4f72a1d..d9b7e1175 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2208,15 +2208,39 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl" + serialNumber + ""; + + //消息英文--不带标签 + String contentNo = "In the "+ technologyTerritoryName + + " technical field you subscribed to, the "+ + category + " " + serialNumber +" has been updated.";; + + //消息英文--带标签 + String contentYes = "In the "+ technologyTerritoryName + + " technical field you subscribed to, the "+ + category + " " + hrefYes +" has been updated.";; + + //消息中文--不带标签 + String contentInfoNo = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + category + " " + serialNumber;; + + //消息中文--带标签 + + String contentInfoYes = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + category + " " + hrefYes;; + + //封装消息的实体类 SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, - content, - contentInfo, + contentNo, + contentYes, MessageTypeEnum.READ.getValue(), MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(), - null, - null); + contentInfoNo, + contentInfoYes); sysAnnouncementService.saveAnnouncement(sysAnnouncement); sendWebsocket(idTemp, contentInfo); //飞书 @@ -2224,7 +2248,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp); //订阅技术领域发消息 List domainUserRelList = domainManageService.list(); -// List thirdIdListAll = new ArrayList<>(); -// List userListAll = new ArrayList<>(); List thirdIdList = new ArrayList<>(); List userList = new ArrayList<>(); String technologyTerritoryNameEn = ""; @@ -3402,12 +3423,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl