WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消息类型添加

Browse Source
This commit is contained in:
zer0Black
2022-07-01 10:43:57 +08:00
parent 407d95f8a4
commit c32ebf0818
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
+5 -4
View File
@@ -6,10 +6,11 @@ package com.jero.common.constant.enums;
* @auth zhn * @auth zhn
*/ */
public enum MessageTypeEnum { public enum MessageTypeEnum {
READ("订阅通知","1"), READ("Subscription Notification","1"),
WARN("预警信息","2"), WARN("Early Warning","2"),
PUSH("转发推送","3"), PUSH("Share / Forward","3"),
COLLECT("认证消息","4"); HOMO_TASK("Homo Parameter Task","4"),
TASK("Regulation Compliance Task", "5");
String name; String name;
String value; String value;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+4 -4
View File
@@ -1061,7 +1061,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
sysAnnouncement.setDelFlag("0"); sysAnnouncement.setDelFlag("0");
sysAnnouncement.setSendStatus("0"); sysAnnouncement.setSendStatus("0");
sysAnnouncement.setSendTime(new Date()); sysAnnouncement.setSendTime(new Date());
sysAnnouncement.setMsgCategory(MessageTypeEnum.COLLECT.getValue());//消息类型 sysAnnouncement.setMsgCategory(MessageTypeEnum.HOMO_TASK.getValue());//消息类型
sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户
sysAnnouncement.setMsgContent(content); sysAnnouncement.setMsgContent(content);
sysAnnouncement.setMsgContentInfo(contentInfo); sysAnnouncement.setMsgContentInfo(contentInfo);
@@ -1070,7 +1070,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
// 发送飞书消息 // 发送飞书消息
try { try {
feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.COLLECT.getName(), hrefFeishu); feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.HOMO_TASK.getName(), hrefFeishu);
} catch (IOException e) { } catch (IOException e) {
log.error("飞书消息推送失败"); log.error("飞书消息推送失败");
} }
@@ -1126,7 +1126,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
sysAnnouncement.setDelFlag("0"); sysAnnouncement.setDelFlag("0");
sysAnnouncement.setSendStatus("0"); sysAnnouncement.setSendStatus("0");
sysAnnouncement.setSendTime(new Date()); sysAnnouncement.setSendTime(new Date());
sysAnnouncement.setMsgCategory(MessageTypeEnum.COLLECT.getValue());//消息类型 sysAnnouncement.setMsgCategory(MessageTypeEnum.HOMO_TASK.getValue());//消息类型
sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户
sysAnnouncement.setMsgContent(content); sysAnnouncement.setMsgContent(content);
sysAnnouncement.setMsgContentInfo(contentInfo); sysAnnouncement.setMsgContentInfo(contentInfo);
@@ -1135,7 +1135,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
// 发送飞书消息 // 发送飞书消息
try { try {
feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.COLLECT.getName(), hrefFeishu); feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.HOMO_TASK.getName(), hrefFeishu);
} catch (IOException e) { } catch (IOException e) {
log.error("飞书消息推送失败"); log.error("飞书消息推送失败");
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java
+9
View File
@@ -1,5 +1,7 @@
package com.jero.modules.feishu.service; package com.jero.modules.feishu.service;
import com.jero.modules.feishu.vo.FeishuMsgVo;
import java.io.IOException; import java.io.IOException;
/** /**
@@ -26,4 +28,11 @@ public interface IFeishuService {
* @throws IOException * @throws IOException
*/ */
String batchSendMessage(String[] userIds, String message, String title, String backUrl) 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;
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+2
View File
@@ -1105,6 +1105,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String msgContentEN = currentUser.getUsername() + " initiated the regulation list confirmation for " + projectNameInfoEO.getProjectName() 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."; + ". The due date is：" +inventoryAffirmDueDate+ " .Please check and address it in a timely manner.";
String feishuMsgContentEN ;
//飞书跳转链接 //飞书跳转链接
String hrefFeishu = backUrl String hrefFeishu = backUrl
+ JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink()