From 8599e503a593f81456e8bf3673df5192a543697a Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 11 Apr 2023 09:51:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF--=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93=E8=BD=AC=E5=8F=91=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProblemKnowledgeBaseEOServiceImpl.java    | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
index 03c26a557..85b905b73 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
@@ -17,6 +17,7 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.document.enums.SearchEnum;
 import com.jero.modules.document.utils.ReadPdfUtil;
 import com.jero.modules.document.utils.ReadWordUtil;
+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.message.websocket.WebSocket;
@@ -908,18 +909,25 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			//XXX向您分享了XXXXXXXXX，请查看。
 			//XXX shared xxxxxxxx with you. Please be reminded to check it out.
 
-			String contentInfoFeiCn = currentUser.getUsername()+"向您分享了"+problemKnowledgeBaseTitle+",请查看";
+			String contentInfoFeiCn = currentUser.getUsername()+"向您分享了"+problemKnowledgeBaseTitle+"，请查看。";
 			String msgContentENTemp = currentUser.getUsername()+" shared " + problemKnowledgeBaseTitle + " with you.Please be reminded to check it out.";
-			FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
-			feishuMsgVo.setTitle(MessageTypeEnum.PUSH.getNameCn()+"/"+MessageTypeEnum.PUSH.getName());
-			feishuMsgVo.setUrl(hrefFeishu);
-			feishuMsgVo.setContentEn(msgContentENTemp);
-			feishuMsgVo.setContent(contentInfoFeiCn);
+//			FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+//			feishuMsgVo.setTitle(MessageTypeEnum.PUSH.getNameCn()+"/"+MessageTypeEnum.PUSH.getName());
+//			feishuMsgVo.setUrl(hrefFeishu);
+//			feishuMsgVo.setContentEn(msgContentENTemp);
+//			feishuMsgVo.setContent(contentInfoFeiCn);
+//			this.iFeishuService.sendCardMsgTerritory(thirdIdList.toArray(new String[]{}), feishuMsgVo);
 
-			this.iFeishuService.sendCardMsgTerritory(thirdIdList.toArray(new String[]{}), feishuMsgVo);
-
-//			this.iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), msgContentEN, MessageTypeEnum.PUSH.getName(), hrefFeishu);
-		} catch (IOException e) {
+			//飞书消息（模板-20230410）
+			Map<String,Object> params = new HashMap<>();
+			params.put("contentInfoFeiCn",contentInfoFeiCn);
+			params.put("contentInfoFeiEn",msgContentENTemp);
+			params.put("userIdList",userIdList);
+			params.put("back_url",hrefFeishu);
+			params.put("titleCn", TemplateInfoEnum2.TRANSPOND_PUSH.getNameCn());
+			params.put("titleEn",TemplateInfoEnum2.TRANSPOND_PUSH.getNameEn());
+			iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
+		} catch (Exception e) {
 			log.error("飞书推送失败");
 		}
 		this.sendWebsocket(problemKnowledgeBaseId, contentInfo);