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 1/2] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF--?= =?UTF-8?q?=E8=99=9A=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 userNameList = dummyReadEOService.queryReadUserInfo(dummyInventoryBaseEO.getId()); List thirdIdList = new ArrayList<>(); + List userIdList = new ArrayList<>(); if(userNameList.size() != 0){ - List 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 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(); } } 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 2/2] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF--?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E9=80=9A=E7=9F=A5,=E8=BD=AC=E5=8F=91?= =?UTF-8?q?=E6=8E=A8=E9=80=81=EF=BC=88=E6=A0=87=E9=A2=98=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=8E=B7=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 batchSendLarkCardMsgByTemplate2(JSONObject json) throws IOException; /** - * 飞书消息模板--订阅通知 + * 飞书消息模板--订阅通知,转发推送 * @param templeteId * @param params */ void sendMessageSubscriptionNotification(String templeteId,Map 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);