From 103b287366209e9b24964996c5a842dc8855de7b Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 27 Oct 2022 09:05:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/feishu/vo/FeishuMsgVo.java |  9 +++++++++
 .../modules/warn/service/LawsWarnService.java   | 17 +++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java
index 63c74a9a6..3544db025 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/vo/FeishuMsgVo.java
@@ -28,5 +28,14 @@ public class FeishuMsgVo {
 
     private String assignee; //评估人 适用范围：责任人提交通知发起人（设计符合性，pre-homo符合性，验证符合性）
 
+    private String RegulationNo; //编号
+
+    private String documentTitle; //文档标题
+
+    private String NewTypeExecutionDate; //新车型实施日期
+
+    private String NewVehicleExecutionDate; //在产车实施日期
+
+
 }
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
index beab9d1eb..b33146b0c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
@@ -13,6 +13,7 @@ import com.jero.modules.document.enums.FieldTypeEnum;
 import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
 import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl;
 import com.jero.modules.feishu.service.IFeishuService;
+import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.system.entity.SysAnnouncement;
 import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
@@ -453,6 +454,22 @@ public class LawsWarnService {
                     }
                 });
                 String contentTemp = sysUser.getUsername() + " has pushed " + StringUtils.join(list, ",") + ", Please be reminded to check it out.";
+
+                //XXX向您分享了法规预警信息。
+                //XXX shared Regulation Early Warning infomation with you.
+                String contentInfoFei = sysUser.getUsername() +" shared Regulation Early Warning infomation with you..";
+                String contentInfoFeiCn = sysUser.getUsername() +"向您分享了法规预警信息";
+                FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+                feishuMsgVo.setTitle(MessageTypeEnum.READ.getNameCn()+"/"+MessageTypeEnum.READ.getName());
+                feishuMsgVo.setUrl(encode);
+                feishuMsgVo.setContentEn(contentInfoFei);
+                feishuMsgVo.setContent(contentInfoFeiCn);
+//                feishuMsgVo.setRegulationNo();
+//                feishuMsgVo.setDocumentTitle();
+//                feishuMsgVo.setNewTypeExecutionDate();
+//                feishuMsgVo.setNewVehicleExecutionDate();
+
+//                iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode);
                 iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode);
             }
         } catch (IOException e) {