From 6bf624b4f1f31611439d85f2bb372288eed4ebf7 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 10 Apr 2023 17:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF--=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=E9=80=9A=E7=9F=A5,=E8=BD=AC=E5=8F=91=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=EF=BC=88=E6=A0=87=E9=A2=98=E5=8A=A8=E6=80=81=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     |   6 +
 .../impl/DummyInventoryBaseEOServiceImpl.java |   2 +
 .../feishu/enums/TemplateInfoEnum2.java       | 117 ++++++++++--------
 .../feishu/service/IFeishuService.java        |   3 +-
 .../service/impl/FeishuServiceImpl.java       |   4 +
 5 files changed, 78 insertions(+), 54 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 9430da4f4..45d144656 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
@@ -2366,6 +2366,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 params.put("contentInfoFeiEn",contentInfoFeiShu);
                 params.put("userIdList",userIdList);
                 params.put("back_url",hrefTemp);
+                params.put("titleCn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn());
+                params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn());
                 iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
 
 
@@ -3649,6 +3651,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 params.put("contentInfoFeiEn",contentInfoFei);
                 params.put("userIdList",userList);
                 params.put("back_url",url);
+                params.put("titleCn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn());
+                params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn());
                 iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
 
 //                iFeishuService.sendCardMsgTerritory(thirdIdList.toArray(new String[]{}), feishuMsgVo);
@@ -3763,6 +3767,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 params.put("contentInfoFeiEn",contentInfoFei);
                 params.put("userIdList",userIdListUpdate);
                 params.put("back_url",url);
+                params.put("titleCn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn());
+                params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn());
                 iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
 
 //                String contentInfoFei = "In the "+category + " " + serialNumber +" you subscribed to, "+sysUser.getUsername()+" changed the " + sbStr.toString();;
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 83f1e1842..1aa9f146f 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
@@ -549,6 +549,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                                     params.put("contentInfoFeiEn",contentLogFeishuTemp + "\n" + contentEn);
                                     params.put("userIdList",userIdList);
                                     params.put("back_url",href);
+                                    params.put("titleCn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn());
+                                    params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn());
                                     iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
 
                                 } catch (Exception e) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java
index 2636b4e1f..d783246d8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java
@@ -6,88 +6,107 @@ package com.jero.modules.feishu.enums;
 public enum TemplateInfoEnum2 {
 
     // 认证消息
-    CERTIFICATION_MESSAGE1("stuido催办，认证工程师收到消息","ctp_AAuDmU58lKqB"),
-    CERTIFICATION_MESSAGE2("Studio发起，认证工程师收到消息","ctp_AAuDmfXCkx8W"),
-    CERTIFICATION_MESSAGE3("认证工程师拒绝，studio收到消息","ctp_AAuDM8YPr3iJ"),
-    CERTIFICATION_MESSAGE4("studio撤回，认证工程师收到消息","ctp_AAuDmgJIf6Mr"),
-    CERTIFICATION_MESSAGE5("studio重置流程，认证工程师收到消息","ctp_AAuDM8YPrBfs"),
-    CERTIFICATION_MESSAGE6("认证清单-任务提醒，截止日期前第三天","ctp_AAuDmfXC3oJo"),
-    CERTIFICATION_MESSAGE7("认证清单-任务提醒，截止日期当天","ctp_AAuDmfXCHc1I"),
-    CERTIFICATION_MESSAGE8("认证清单-任务提醒，已逾期","ctp_AAuDMwOPU71H"),
+    CERTIFICATION_MESSAGE1("stuido催办，认证工程师收到消息","ctp_AAuDmU58lKqB",""),
+    CERTIFICATION_MESSAGE2("Studio发起，认证工程师收到消息","ctp_AAuDmfXCkx8W",""),
+    CERTIFICATION_MESSAGE3("认证工程师拒绝，studio收到消息","ctp_AAuDM8YPr3iJ",""),
+    CERTIFICATION_MESSAGE4("studio撤回，认证工程师收到消息","ctp_AAuDmgJIf6Mr",""),
+    CERTIFICATION_MESSAGE5("studio重置流程，认证工程师收到消息","ctp_AAuDM8YPrBfs",""),
+    CERTIFICATION_MESSAGE6("认证清单-任务提醒，截止日期前第三天","ctp_AAuDmfXC3oJo",""),
+    CERTIFICATION_MESSAGE7("认证清单-任务提醒，截止日期当天","ctp_AAuDmfXCHc1I",""),
+    CERTIFICATION_MESSAGE8("认证清单-任务提醒，已逾期","ctp_AAuDMwOPU71H",""),
     //CERTIFICATION_MESSAGE9("认证清单-责任人分发（转办），第二责任人收到消息","ctp_AAuDM8YP6soc"),
-    CERTIFICATION_MESSAGE10("认证工程师发起流程，责任人收到消息","ctp_AAuePL6rUK1L"),
-    CERTIFICATION_MESSAGE11("责任人拒绝，认证工程师收到消息","ctp_AAu2ZrSEiB1V"),
-    CERTIFICATION_MESSAGE12("责任人接受，认证工程师收到消息","ctp_AAuePL6r3B0I"),
-    CERTIFICATION_MESSAGE13("studio修改认证工程师，被修改人收到消息","ctp_AAuLRr2QhG9J"),
-    CERTIFICATION_MESSAGE14("studio修改符合性截止时间，认证工程师收到消息","ctp_AAuePL6r3XqN"),
-    CERTIFICATION_MESSAGE15("认证工程师修改责任人，被修改人收到消息","ctp_AAu2ZrSE1z3f"),
-    CERTIFICATION_MESSAGE16("认证工程师催办，责任人收到消息","ctp_AAuPfn0M0H6i"),
-    CERTIFICATION_MESSAGE17("责任人下发工程师，工程师接收-任务","ctp_AAuPfn0MCwlH"),
-    CERTIFICATION_MESSAGE18("任务提醒，责任人接收-任务 发起人催办责任人","ctp_AAuPh3LJ2Nex"),
-    CERTIFICATION_MESSAGE19("任务提醒，责任人接收-任务 两周通知","ctp_AAuPh3LJKUZk"),
-    CERTIFICATION_MESSAGE20("任务提醒，责任人接收-任务 一周通知","ctp_AAuXnIIM45B0"),
-    CERTIFICATION_MESSAGE21("任务提醒，责任人接收-任务 当天","ctp_AAu2lBIgnWND"),
-    CERTIFICATION_MESSAGE22("任务提醒，责任人接收-任务 逾期之后 每天通知","ctp_AAuPfn0MDOYu"),
-    CERTIFICATION_MESSAGE23("责任人提交，发起人接收审查任务-任务","ctp_AAuPh3LJKoIX"),
-    CERTIFICATION_MESSAGE24("发起人审查退回，责任人接收-任务","ctp_AAu2lBIgZK5f"),
-    CERTIFICATION_MESSAGE25("发起人审查通过，责任人接收通知-通知","ctp_AAuPKJ9CDwIP"),
+    CERTIFICATION_MESSAGE10("认证工程师发起流程，责任人收到消息","ctp_AAuePL6rUK1L",""),
+    CERTIFICATION_MESSAGE11("责任人拒绝，认证工程师收到消息","ctp_AAu2ZrSEiB1V",""),
+    CERTIFICATION_MESSAGE12("责任人接受，认证工程师收到消息","ctp_AAuePL6r3B0I",""),
+    CERTIFICATION_MESSAGE13("studio修改认证工程师，被修改人收到消息","ctp_AAuLRr2QhG9J",""),
+    CERTIFICATION_MESSAGE14("studio修改符合性截止时间，认证工程师收到消息","ctp_AAuePL6r3XqN",""),
+    CERTIFICATION_MESSAGE15("认证工程师修改责任人，被修改人收到消息","ctp_AAu2ZrSE1z3f",""),
+    CERTIFICATION_MESSAGE16("认证工程师催办，责任人收到消息","ctp_AAuPfn0M0H6i",""),
+    CERTIFICATION_MESSAGE17("责任人下发工程师，工程师接收-任务","ctp_AAuPfn0MCwlH",""),
+    CERTIFICATION_MESSAGE18("任务提醒，责任人接收-任务 发起人催办责任人","ctp_AAuPh3LJ2Nex",""),
+    CERTIFICATION_MESSAGE19("任务提醒，责任人接收-任务 两周通知","ctp_AAuPh3LJKUZk",""),
+    CERTIFICATION_MESSAGE20("任务提醒，责任人接收-任务 一周通知","ctp_AAuXnIIM45B0",""),
+    CERTIFICATION_MESSAGE21("任务提醒，责任人接收-任务 当天","ctp_AAu2lBIgnWND",""),
+    CERTIFICATION_MESSAGE22("任务提醒，责任人接收-任务 逾期之后 每天通知","ctp_AAuPfn0MDOYu",""),
+    CERTIFICATION_MESSAGE23("责任人提交，发起人接收审查任务-任务","ctp_AAuPh3LJKoIX",""),
+    CERTIFICATION_MESSAGE24("发起人审查退回，责任人接收-任务","ctp_AAu2lBIgZK5f",""),
+    CERTIFICATION_MESSAGE25("发起人审查通过，责任人接收通知-通知","ctp_AAuPKJ9CDwIP",""),
 
 
 
     /**
      * 法规清单发布相关消息模板
      */
-    REGULATION_LIST_RELEASE1("Studio发起或stuido催办，法规工程师收到消息","ctp_AAuL6mDxMKxu"),
-    REGULATION_LIST_RELEASE2("法规清单发布-公用消息-绿色","ctp_AAuPKJ9Cj9w5"),
-    REGULATION_LIST_RELEASE3("法规清单发布-公用消息-红色","ctp_AAu2lBIgaB79"),
-    REGULATION_LIST_RELEASE4("法规清单发布-公用消息-黄色","ctp_AAuPh3LJWg1x"),
+    REGULATION_LIST_RELEASE1("Studio发起或stuido催办，法规工程师收到消息","ctp_AAuL6mDxMKxu",""),
+    REGULATION_LIST_RELEASE2("法规清单发布-公用消息-绿色","ctp_AAuPKJ9Cj9w5",""),
+    REGULATION_LIST_RELEASE3("法规清单发布-公用消息-红色","ctp_AAu2lBIgaB79",""),
+    REGULATION_LIST_RELEASE4("法规清单发布-公用消息-黄色","ctp_AAuPh3LJWg1x",""),
 
     /**
      * 法规任务确认消息
      */
-    REGULATION_TASK_CONFIRMATION1("法规任务确认-公用消息-绿色-无流程类型","ctp_AAuLRr2QIbMb"),
-    REGULATION_TASK_CONFIRMATION2("法规任务确认-公用消息-红色-无流程类型","ctp_AAuL6mDxffmu"),
-    REGULATION_TASK_CONFIRMATION3("法规任务确认-公用消息-黄色-无流程类型","ctp_AAuLRr2Qzyj0"),
-    REGULATION_TASK_CONFIRMATION4("法规任务确认-公用消息-绿色-有流程类型","ctp_AAuL6mDxf8l1"),
-    REGULATION_TASK_CONFIRMATION5("法规任务确认-公用消息-红色-有流程类型","ctp_AAuPWTSU2Fg2"),
-    REGULATION_TASK_CONFIRMATION6("法规任务确认-公用消息-黄色-有流程类型","ctp_AAuLRr2Qzkbo"),
+    REGULATION_TASK_CONFIRMATION1("法规任务确认-公用消息-绿色-无流程类型","ctp_AAuLRr2QIbMb",""),
+    REGULATION_TASK_CONFIRMATION2("法规任务确认-公用消息-红色-无流程类型","ctp_AAuL6mDxffmu",""),
+    REGULATION_TASK_CONFIRMATION3("法规任务确认-公用消息-黄色-无流程类型","ctp_AAuLRr2Qzyj0",""),
+    REGULATION_TASK_CONFIRMATION4("法规任务确认-公用消息-绿色-有流程类型","ctp_AAuL6mDxf8l1",""),
+    REGULATION_TASK_CONFIRMATION5("法规任务确认-公用消息-红色-有流程类型","ctp_AAuPWTSU2Fg2",""),
+    REGULATION_TASK_CONFIRMATION6("法规任务确认-公用消息-黄色-有流程类型","ctp_AAuLRr2Qzkbo",""),
 
 
     /**
      * 设计符合性流程
      */
-    DESIGN_COMPLIANCE_CONFIRMATION1("设计符合性流程-公用消息-绿色","ctp_AAuPIdaoms57"),
-    DESIGN_COMPLIANCE_CONFIRMATION2("设计符合性流程-公用消息-红色","ctp_AAuLRr2QX8xb"),
-    DESIGN_COMPLIANCE_CONFIRMATION3("设计符合性流程-公用消息-黄色","ctp_AAuLdvF0lUtu"),
+    DESIGN_COMPLIANCE_CONFIRMATION1("设计符合性流程-公用消息-绿色","ctp_AAuPIdaoms57",""),
+    DESIGN_COMPLIANCE_CONFIRMATION2("设计符合性流程-公用消息-红色","ctp_AAuLRr2QX8xb",""),
+    DESIGN_COMPLIANCE_CONFIRMATION3("设计符合性流程-公用消息-黄色","ctp_AAuLdvF0lUtu",""),
 
     /**
      * 验证符合性流程
      */
-    VALIDATION_COMPLIANCE_CONFIRMATION1("验证符合性流程-公用消息-绿色","ctp_AAuLdvF0lS41"),
-    VALIDATION_COMPLIANCE_CONFIRMATION2("验证符合性流程-公用消息-红色","ctp_AAu2lBI6MV0i"),
-    VALIDATION_COMPLIANCE_CONFIRMATION3("验证符合性流程-公用消息-黄色","ctp_AAupcD3RBbUV"),
+    VALIDATION_COMPLIANCE_CONFIRMATION1("验证符合性流程-公用消息-绿色","ctp_AAuLdvF0lS41",""),
+    VALIDATION_COMPLIANCE_CONFIRMATION2("验证符合性流程-公用消息-红色","ctp_AAu2lBI6MV0i",""),
+    VALIDATION_COMPLIANCE_CONFIRMATION3("验证符合性流程-公用消息-黄色","ctp_AAupcD3RBbUV",""),
 
     /**
      * 订阅通知
      */
-    SUBSCRIPTION_INFORM("通用-订阅消息模板","ctp_AAfvdg0Cy90I"),
+    SUBSCRIPTION_INFORM("订阅通知","ctp_AAfvdg0Cy90I","Subscription Notification"),
 
     /**
      * 转发推送
      */
-    TRANSPOND_PUSH1("转发推送",""),
+    TRANSPOND_PUSH("转发推送","ctp_AArfkau1GRMZ","Share / Forward"),
 
 
 
     ;
 
-    String name;
+    String nameCn;
+    String nameEn;
     String value;
 
-    private TemplateInfoEnum2(String name, String value) {
-        this.name = name;
+    private TemplateInfoEnum2(String nameCn, String value,String nameEn) {
+        this.nameCn = nameCn;
         this.value = value;
+        this.nameEn = nameEn;
     }
+
+    public String getNameCn() {
+        return nameCn;
+    }
+
+    public void setNameCn(String nameCn) {
+        this.nameCn = nameCn;
+    }
+
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
+
     public String getValue() {
         return value;
     }
@@ -95,12 +114,4 @@ public enum TemplateInfoEnum2 {
     public void setValue(String value) {
         this.value = value;
     }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java
index 486751a42..225fde2e1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java
@@ -132,9 +132,10 @@ public interface IFeishuService {
     Result<?> batchSendLarkCardMsgByTemplate2(JSONObject json) throws IOException;
 
     /**
-     * 飞书消息模板--订阅通知
+     * 飞书消息模板--订阅通知,转发推送
      * @param templeteId
      * @param params
      */
     void sendMessageSubscriptionNotification(String templeteId,Map<String,Object> params);
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java
index c15aeca58..41143401a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java
@@ -1445,6 +1445,8 @@ public class FeishuServiceImpl implements IFeishuService {
             String contentCn = (String) params.get("contentInfoFeiCn");
             String contentEn = (String) params.get("contentInfoFeiEn");
             String back_url = (String) params.get("back_url");
+            String titleCn = (String) params.get("titleCn");
+            String titleEn = (String) params.get("titleEn");
             try {
                 for (String userId : userIdList) {
                     String thirdId = this.sysUserService.getUserThirdIdByUserId(userInfoList,userId);
@@ -1458,6 +1460,8 @@ public class FeishuServiceImpl implements IFeishuService {
                         templateVariableMap.put("contentInfoFeiEn",contentEn);
                         templateVariableMap.put("view_url_cn",back_url);
                         templateVariableMap.put("view_url_en",back_url);
+                        templateVariableMap.put("titleCn",titleCn);
+                        templateVariableMap.put("titleEn",titleEn);
 
                         larkMesJson.put("templateVariableMap",templateVariableMap);
                         batchSendLarkCardMsgByTemplate2(larkMesJson);