From 702d372c1db8ad9d9672e1f942a540e4de43e865 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 28 Oct 2022 15:41:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E7=BB=99=E8=AE=A2=E9=98=85=E9=A2=86=E5=9F=9F=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=8F=91=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

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..d3d869644 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<BussDocumentLi
                     + " technical field you subscribed to, the "
                     + href +" has been updated.";
             String msgTitle = "The " + technologyTerritoryName + " technical field you subscribed to has been updated";
+
+
+            String hrefYes = category + " " + "<a href='/docManage/library/detail?id=" + idTemp +
+                    "&title=" + title +
+                    "&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
+
+            //消息英文--不带标签
+            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<BussDocumentLi
                 String contentInfoFeiShu = "In the "+ technologyTerritoryName
                         + " technical field you subscribed to, the "+
                         category + " " + serialNumber +" has been updated.";
-                String contentInfoFeiShuCn = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + category + " " + serialNumber;;
+                String contentInfoFeiShuCn = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + category + " " + serialNumber;
 
                 FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
                 feishuMsgVo.setTitle(MessageTypeEnum.READ.getNameCn()+"/"+MessageTypeEnum.READ.getName());

From 3963b58f724450f6a58396e81051ce3a2d07ed43 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 28 Oct 2022 15:52:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E6=A1=A3=E7=BC=96=E8=BE=91--?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85=E9=A2=86=E5=9F=9F=E5=8F=91=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

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 d3d869644..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
@@ -3406,11 +3406,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         mapTemp.put("domainId", map.get("technology_territory"));
         mapTemp.put("documentId", map.get("id"));
         //订阅技术领域的人和订阅该条标准的人
-//        List<String> userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp);
         //订阅技术领域发消息
         List<DomainUserRel> domainUserRelList = domainManageService.list();
-//        List<String> thirdIdListAll = new ArrayList<>();
-//        List<String> userListAll = new ArrayList<>();
         List<String> thirdIdList = new ArrayList<>();
         List<String> userList = new ArrayList<>();
         String technologyTerritoryNameEn = "";
@@ -3426,12 +3423,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     if(sysUsersFeishu.size() != 0){
                         thirdIdList = sysUsersFeishu.stream().map(SysUser::getThirdId).collect(Collectors.toList());
                         userList = sysUsersFeishu.stream().map(SysUser::getId).collect(Collectors.toList());
-//                        if(thirdIdList.size() != 0){
-//                            thirdIdListAll.addAll(thirdIdList);
-//                        }
-//                        if(userList.size() != 0){
-//                            userListAll.addAll(userList);
-//                        }
                     }
                 }
                 if(domainIdList.size() != 0){
@@ -3467,19 +3458,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(sysUsers)) {
                     userIdListUpdate = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
                     userIdListUpdateFeishu = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
-//                    if(userIdListUpdate.size() != 0){
-//                        userListAll.addAll(userIdListUpdate);
-//                    }
-//                    if(userIdListUpdateFeishu.size() != 0){
-//                        thirdIdListAll.addAll(userIdListUpdateFeishu);
-//                    }
                 }
             }
         }
 
         //订阅管理
         if(thirdIdList.size() != 0){
-//            thirdIdListAll = thirdIdListAll.stream().distinct().collect(Collectors.toList());
             String contentInfoFei = "In the " + technologyTerritoryNameEn + " technical field you subscribed to, the " +
                     category + " " + serialNumber+" has been updated.";
             String contentInfoFeiCn = "您所订阅的" + technologyTerritoryNameEn + "技术领域中更新了" + categoryCn + " " + serialNumber;
@@ -3510,15 +3494,30 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 //您订阅的XXX已被修改
                 String contentInfo = "In the " + technologyTerritoryNameEn + " technical field you subscribed to," +sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
                 String msgTitle = "The " + technologyTerritoryNameEn + " technical field you subscribed to has been updated";
+                //消息英文--不带标签
+                String contentNo = "In the " + technologyTerritoryNameEn + " technical field you subscribed to, the " +
+                        category + " " + serialNumber+" has been updated.";;
+
+                //消息英文--带标签
+                String contentYes = "In the " + technologyTerritoryNameEn + " technical field you subscribed to, the " +
+                        category + " " + href+" has been updated.";;
+
+                //消息中文--不带标签
+                String contentInfoNo = "您所订阅的" + technologyTerritoryNameEn + "技术领域中更新了" + categoryCn + " " + serialNumber;;
+
+                //消息中文--带标签
+                String contentInfoYes = "您所订阅的" + technologyTerritoryNameEn + "技术领域中更新了" + categoryCn + " " + href;;
+
+
                 // 封装消息的实体类
                 SysAnnouncement sysAnnouncement = getSysAnnouncement(userList,
                         msgTitle,
-                        contentInfoFei,
-                        contentInfo,
+                        contentNo,
+                        contentYes,
                         MessageTypeEnum.READ.getValue(),
                         MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(),
-                        null,
-                        null);
+                        contentInfoNo,
+                        contentInfoYes);
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                 sendWebsocket((String) map.get("id"), contentInfo);
             }