From c32ebf0818aa11473660bb24f74419a711e809f8 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Fri, 1 Jul 2022 10:43:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/common/constant/enums/MessageTypeEnum.java  | 9 +++++----
 .../service/impl/ParamsCollectManifestEOServiceImpl.java | 8 ++++----
 .../com/jero/modules/feishu/service/IFeishuService.java  | 9 +++++++++
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java  | 2 ++
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
index 2f92b685e..4f5a85094 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
@@ -6,10 +6,11 @@ package com.jero.common.constant.enums;
  * @auth zhn
  */
 public enum MessageTypeEnum {
-    READ("订阅通知","1"),
-    WARN("预警信息","2"),
-    PUSH("转发推送","3"),
-    COLLECT("认证消息","4");
+    READ("Subscription Notification","1"),
+    WARN("Early Warning","2"),
+    PUSH("Share / Forward","3"),
+    HOMO_TASK("Homo Parameter Task","4"),
+    TASK("Regulation Compliance Task", "5");
 
     String name;
     String value;
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index af78bfab8..03cd16f4f 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1061,7 +1061,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		sysAnnouncement.setDelFlag("0");
 		sysAnnouncement.setSendStatus("0");
 		sysAnnouncement.setSendTime(new Date());
-		sysAnnouncement.setMsgCategory(MessageTypeEnum.COLLECT.getValue());//消息类型
+		sysAnnouncement.setMsgCategory(MessageTypeEnum.HOMO_TASK.getValue());//消息类型
 		sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户
 		sysAnnouncement.setMsgContent(content);
 		sysAnnouncement.setMsgContentInfo(contentInfo);
@@ -1070,7 +1070,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		// 发送飞书消息
 		try {
-			feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.COLLECT.getName(), hrefFeishu);
+			feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.HOMO_TASK.getName(), hrefFeishu);
 		} catch (IOException e) {
 			log.error("飞书消息推送失败");
 		}
@@ -1126,7 +1126,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			sysAnnouncement.setDelFlag("0");
 			sysAnnouncement.setSendStatus("0");
 			sysAnnouncement.setSendTime(new Date());
-			sysAnnouncement.setMsgCategory(MessageTypeEnum.COLLECT.getValue());//消息类型
+			sysAnnouncement.setMsgCategory(MessageTypeEnum.HOMO_TASK.getValue());//消息类型
 			sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户
 			sysAnnouncement.setMsgContent(content);
 			sysAnnouncement.setMsgContentInfo(contentInfo);
@@ -1135,7 +1135,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 			// 发送飞书消息
 			try {
-				feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.COLLECT.getName(), hrefFeishu);
+				feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.HOMO_TASK.getName(), hrefFeishu);
 			} catch (IOException e) {
 				log.error("飞书消息推送失败");
 			}
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 e529ecbb8..425e8aad1 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
@@ -1,5 +1,7 @@
 package com.jero.modules.feishu.service;
 
+import com.jero.modules.feishu.vo.FeishuMsgVo;
+
 import java.io.IOException;
 
 /**
@@ -26,4 +28,11 @@ public interface IFeishuService {
      * @throws IOException
      */
     String batchSendMessage(String[] userIds, String message, String title, String backUrl) throws IOException;
+
+    /**
+     * 发送卡片消息
+     * @param feishuMsgVo
+     * @return
+     */
+    String sendCardMsg(String[] userIds, FeishuMsgVo feishuMsgVo) throws IOException;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index f7d393ae3..7e5011913 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -1105,6 +1105,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					String msgContentEN = currentUser.getUsername() + " initiated the regulation list confirmation for " + projectNameInfoEO.getProjectName()
 							+ ". The due date is：" +inventoryAffirmDueDate+ " .Please check and address it in a timely manner.";
 
+					String feishuMsgContentEN ;
+
 					//飞书跳转链接
 					String hrefFeishu = backUrl
 							+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink()