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

---
 .../impl/DummyInventoryBaseEOServiceImpl.java | 46 +++++++++++++++----
 1 file changed, 36 insertions(+), 10 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 e20bfa87c..83f1e1842 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
@@ -28,8 +28,8 @@ import com.jero.modules.dummy.service.IDummyInventoryBaseEOService;
 import com.jero.modules.dummy.service.IDummyInventoryInfoEOService;
 import com.jero.modules.dummy.service.IDummyReadEOService;
 import com.jero.modules.dummy.vo.VirtualCreaterVo;
+import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.feishu.service.IFeishuService;
-import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.system.entity.SysAnnouncement;
@@ -56,6 +56,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -494,8 +495,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
 
                             List<String> userNameList = dummyReadEOService.queryReadUserInfo(dummyInventoryBaseEO.getId());
                             List<String> thirdIdList = new ArrayList<>();
+                            List<String> userIdList = new ArrayList<>();
                             if(userNameList.size() != 0){
-                                List<String> userIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getId()).collect(Collectors.toList());
+                                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){
                                     //封装消息的实体类
@@ -517,15 +519,39 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                                 String href = backUrl + "/virtualListDetails?name=" + baseEO.getName() + "&useExplain=" + baseEO.getUseExplain() +"&id=" + baseEO.getId() +"&title=维护虚拟清单";
                                 try {
                                     String contentInfoFeiCn = "您所订阅的"+baseEO.getName()+"虚拟清单已更新,更新内容如下:";
-                                    FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
-                                    feishuMsgVo.setTitle(MessageTypeEnum.READ.getNameCn()+"/"+MessageTypeEnum.READ.getName());
-                                    feishuMsgVo.setUrl(href);
-                                    feishuMsgVo.setContentEn(contentLogFeishuTemp);
-                                    feishuMsgVo.setContent(contentInfoFeiCn);
-
-                                    iFeishuService.sendCardMsgVirtua(thirdIdList.toArray(new String[]{}),feishuMsgVo,serialNumberAddList,serialNumberDeleteList);
+//                                    FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+//                                    feishuMsgVo.setTitle(MessageTypeEnum.READ.getNameCn()+"/"+MessageTypeEnum.READ.getName());
+//                                    feishuMsgVo.setUrl(href);
+//                                    feishuMsgVo.setContentEn(contentLogFeishuTemp);
+//                                    feishuMsgVo.setContent(contentInfoFeiCn);
+//                                    iFeishuService.sendCardMsgVirtua(thirdIdList.toArray(new String[]{}),feishuMsgVo,serialNumberAddList,serialNumberDeleteList);
 //                                    iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentLogFeishu, MessageTypeEnum.PUSH.getName(), href);
-                                } catch (IOException e) {
+
+                                    String contentCn = "";
+                                    String contentEn = "";
+                                    if(!serialNumberAddList.isEmpty() && serialNumberDeleteList.isEmpty()){
+                                        contentCn = "1. 新增文档: " + StringUtils.join(serialNumberAddList,",");
+                                        contentEn = "1. New regulations: " + StringUtils.join(serialNumberAddList,",");
+                                    }
+                                    if(serialNumberAddList.isEmpty() && !serialNumberDeleteList.isEmpty()){
+                                        contentCn = "1. 删除文档: " + StringUtils.join(serialNumberDeleteList,",");
+                                        contentEn = "1. Remove regulations: " + StringUtils.join(serialNumberDeleteList,",");
+                                    }
+                                    if(!serialNumberAddList.isEmpty() && !serialNumberDeleteList.isEmpty()){
+                                        contentCn = "1. 新增文档: " + StringUtils.join(serialNumberAddList,",") + "\n"
+                                                +"2. 删除文档: " + StringUtils.join(serialNumberDeleteList,",");
+                                        contentEn = "1. New regulations: " + StringUtils.join(serialNumberAddList,",") + "\n"
+                                                +"2. Remove regulations: " + StringUtils.join(serialNumberDeleteList,",");
+                                    }
+                                    //飞书消息（模板-20230410）
+                                    Map<String,Object> params = new HashMap<>();
+                                    params.put("contentInfoFeiCn",contentInfoFeiCn + "\n" + contentCn);
+                                    params.put("contentInfoFeiEn",contentLogFeishuTemp + "\n" + contentEn);
+                                    params.put("userIdList",userIdList);
+                                    params.put("back_url",href);
+                                    iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
+
+                                } catch (Exception e) {
                                     e.printStackTrace();
                                 }
                             }