From b5cbb527175258b217a7d756092f0eb90a4e4d05 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 3 Nov 2022 14:49:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93=E8=AF=84=E8=AE=BA=E6=B6=88=E6=81=AF=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...blemKnowledgeBaseCommentEOServiceImpl.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java index a5a6e52ac..82050c16a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java @@ -88,28 +88,33 @@ public class ProblemKnowledgeBaseCommentEOServiceImpl extends ServiceImpl"+ problemKnowledgeBaseEO.getTitle() + ""; + String contentINfoCNNo = "您发布的问题知识库信息"+href+"有新评论,请注意查看."; + String contentInfoENNo = "In the Q&A knowledge "+href+" you created, a new comment has been added. Please be reminded to check it out."; + + //发送消息(站内和飞书) //您发布的问题知识库信息XXXXXXXX有新评论，请注意查看。 //In the Q&A knowledge xxxxxxxx you created, a new comment has been added. Please be reminded to check it out. SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(Arrays.asList(sysUser.getId().split(",")), "msgTitle", contentENNo, - contentENNo, + contentInfoENNo, MessageTypeEnum.PUSH.getValue(), MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(), contentCNNo, - contentCNNo); + contentINfoCNNo); this.sysAnnouncementService.saveAnnouncement(sysAnnouncement); bussDocumentLibraryEOService.sendWebsocket(com.jero.modules.system.util.StringUtils.join(sysUser.getThirdId(), ","), sysUser.getThirdId()); - String href = backUrl +"/problemknowledgeBase"; +// String href = backUrl +"/problemknowledgeBase"; FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); feishuMsgVo.setTitle(MessageTypeEnum.PUSH.getNameCn()+"/"+MessageTypeEnum.PUSH.getName()); - feishuMsgVo.setUrl(href); + feishuMsgVo.setUrl(url); feishuMsgVo.setContentEn(contentENNo); feishuMsgVo.setContent(contentCNNo); From 906ee96ad07df0034419e21a02a4d6b724d932a4 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 3 Nov 2022 15:27:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryBaseEOServiceImpl.java | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index f457388b6..123aea86b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -455,10 +455,14 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl" + baseEO.getName() + ""; + //消息英文--不带标签 String contentNo = "The "+ baseEO.getName()+" virtual list you subscribed to has been updated as follows：" + sbContentNo; //消息英文--带标签 - String contentYes = "The "+ baseEO.getName()+" virtual list you subscribed to has been updated as follows："+ "
" + sbContentYes;; + String contentYes = "The "+ hrefTemp+" virtual list you subscribed to has been updated as follows："+ "
" + sbContentYes;; int countInfoNo = 1; StringBuilder sbContentINfoNo = new StringBuilder(); @@ -483,9 +487,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"+sbContentInfoYes; - - + String contentInfoYes = "您所订阅的"+hrefTemp+"虚拟清单已更新,更新内容如下:"+"
"+sbContentInfoYes; List userNameList = dummyReadEOService.queryReadUserInfo(dummyInventoryBaseEO.getId()); List thirdIdList = new ArrayList<>(); @@ -548,20 +550,25 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl userIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getId()).collect(Collectors.toList()); thirdIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getThirdId()).collect(Collectors.toList()); if(userIdList.size() != 0){ + String hrefTemp = "" + baseEO.getName() + ""; //封装消息的实体类 The XX virtual list you subscribed to has been withdrawn String title = "The "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; //Please note that the XX virtual list you subscribed to has been withdrawn. String contentLog = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; - String contentCn = "您订阅的虚拟清单"+ baseEO.getName()+"已被撤回."; - String contentInfoEn = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; + String contentCnNo = "您订阅的虚拟清单"+ baseEO.getName()+"已被撤回."; + String contentCnYes = "您订阅的虚拟清单"+ hrefTemp+"已被撤回."; + String contentInfoEnNo = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn."; + String contentInfoEnYes = "Please note that the "+ hrefTemp+" virtual list you subscribed to has been withdrawn."; SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, - contentInfoEn, - contentInfoEn, + contentInfoEnNo, + contentInfoEnYes, MessageTypeEnum.READ.getValue(), MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(), - contentCn,contentCn); + contentCnNo,contentCnYes); sysAnnouncementService.saveAnnouncement(sysAnnouncement); bussDocumentLibraryEOService.sendWebsocket(dummyInventoryBaseEO.getId(), title); }