From 1b29bb2ed2b1069e8c028b69ebd60d6724c9a8ba Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 27 Jul 2022 09:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95--=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 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 a016f8884..6af72e8d9 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
@@ -365,6 +365,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
             lambdaQueryWrapper.in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryBaseEO.getId());
             List<DummyInventoryInfoEO> dummyInventoryInfoEOList = iDummyInventoryInfoEOService.list(lambdaQueryWrapper);
             String contentLog = "The "+ baseEO.getName()+" virtual list you subscribed to has been updated as follows：" + "</br>";
+            String contentLogFeishu = "The "+ baseEO.getName()+" virtual list you subscribed to has been updated as follows：" + "  ";
 
             if(dummyContentChangeEOList.size() == 0){
                 //没有添加过需要进行第一次添加
@@ -415,6 +416,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                                 hrefList.add(href);
                             }
                             contentLog += count+". New regulations: " + StringUtils.join(hrefList,",") + "</br>";
+                            contentLogFeishu += count+". New regulations: " + StringUtils.join(serialNumberAddList,",") + "  ";
                             count++;
                         }
                         if(serialNumberDeleteList.size() != 0){
@@ -426,6 +428,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                                 hrefList.add(href);
                             }
                             contentLog += count + ". Remove regulations: " + StringUtils.join(hrefList,",") + "</br>";
+                            contentLogFeishu += count + ". Remove regulations: " + StringUtils.join(serialNumberDeleteList,",") + "  ";
                         }
 
                         if(serialNumberAddList.size() != 0 || serialNumberDeleteList.size() != 0){
@@ -436,7 +439,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                                 thirdIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getThirdId()).collect(Collectors.toList());
                                 if(userIdList.size() != 0){
                                     //封装消息的实体类
-                                    String title = "The "+ baseEO.getName()+" virtual list you subscribed to has been updated";
+                                    String title = "The "+ baseEO.getName()+" virtual list you subscribed to has been updated.";
                                     SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, title, contentLog,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                                     sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                                     bussDocumentLibraryEOService.sendWebsocket(dummyInventoryBaseEO.getId(), title);
@@ -446,7 +449,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                             if(thirdIdList.size() != 0){
                                 String href = backUrl + "/virtualListDetails?name=" + baseEO.getName() + "&useExplain=" + baseEO.getUseExplain() +"&id=" + baseEO.getId() +"&title=维护虚拟清单";
                                 try {
-                                    iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentLog, MessageTypeEnum.PUSH.getName(), href);
+                                    iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentLogFeishu, MessageTypeEnum.PUSH.getName(), href);
                                 } catch (IOException e) {
                                     e.printStackTrace();
                                 }
@@ -476,18 +479,17 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     thirdIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getThirdId()).collect(Collectors.toList());
                     if(userIdList.size() != 0){
                         //封装消息的实体类  The XX virtual list you subscribed to has been withdrawn
-                        String title = "The "+ baseEO.getName()+" 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 contentLog = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn.";
                         SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, title, contentLog,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                         bussDocumentLibraryEOService.sendWebsocket(dummyInventoryBaseEO.getId(), title);
                     }
-                    sendMsg(null, dummyInventoryBaseEO.getId(),null,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
                 }
                 //飞书
                 if(thirdIdList.size() != 0){
-                    String contentInfoTemp = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn";
+                    String contentInfoTemp = "Please note that the "+ baseEO.getName()+" virtual list you subscribed to has been withdrawn.";
                     String href = backUrl + "/virtualListDetails?name=" + baseEO.getName() + "&useExplain=" + baseEO.getUseExplain() +"&id=" + baseEO.getId() +"&title=维护虚拟清单";
                     iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfoTemp, MessageTypeEnum.PUSH.getName(), href);
                 }