feat: 系统消息支持跳转

This commit is contained in:
2024-03-21 14:40:22 +08:00
parent 23edc0d888
commit 022dbac006
11 changed files with 33 additions and 10 deletions
@@ -37,4 +37,10 @@ public class SysMessageTemplate extends JeroEntity {
@Excel(name = "模板类型", width = 15)
@Dict(dicCode = "msgType")
private java.lang.String templateType;
/**打开方式(组件:component 路由:url)*/
private java.lang.String openType;
/**组件/路由 地址*/
private java.lang.String openPage;
}
@@ -2,5 +2,5 @@ package com.jero.modules.message.handle;
public interface ISendMsgHandle {
void SendMsg(String esReceiver, String esTitle, String esContent);
void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage);
}
@@ -18,7 +18,7 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
}
@Override
public void SendMsg(String esReceiver, String esTitle, String esContent) {
public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage) {
JavaMailSender mailSender = (JavaMailSender) SpringContextUtils.getBean("mailSender");
MimeMessage message = mailSender.createMimeMessage();
MimeMessageHelper helper = null;
@@ -16,7 +16,7 @@ import java.util.Date;
public class SmsSendMsgHandle implements ISendMsgHandle {
@Override
public void SendMsg(String esReceiver, String esTitle, String esContent) {
public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage) {
ISysAnnouncementService bean = SpringContextUtils.getBean(ISysAnnouncementService.class);
String id = UUIDUtils.randomUUID20();
SysAnnouncement sysAnnouncement = new SysAnnouncement();
@@ -37,6 +37,8 @@ public class SmsSendMsgHandle implements ISendMsgHandle {
sysAnnouncement.setSendTime(new Date());
sysAnnouncement.setDelFlag("0");
sysAnnouncement.setUserIds(esReceiver);
sysAnnouncement.setOpenType(openType);
sysAnnouncement.setOpenPage(openPage);
log.info("发送Local系统消息: {}", JSONObject.toJSONString(sysAnnouncement));
@@ -6,7 +6,7 @@ import com.jero.modules.message.handle.ISendMsgHandle;
public class WxSendMsgHandle implements ISendMsgHandle {
@Override
public void SendMsg(String esReceiver, String esTitle, String esContent) {
public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage) {
// TODO Auto-generated method stub
log.info("发微信消息模板");
}
@@ -58,7 +58,7 @@ public class SendMsgJob implements Job {
throw new NullPointerException();
}
sendMsgHandle.SendMsg(sysMessage.getEsReceiver(), sysMessage.getEsTitle(),
sysMessage.getEsContent());
sysMessage.getEsContent(), null, null);
// 发送消息成功
sysMessage.setEsSendStatus(SendMsgStatusEnum.SUCCESS.getCode());
} catch (Exception e) {
@@ -1050,7 +1050,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
@Override
public void sendEmailMsg(String email, String title, String content) {
EmailSendMsgHandle emailHandle=new EmailSendMsgHandle();
emailHandle.SendMsg(email, title, content);
emailHandle.SendMsg(email, title, content, null, null);
}
/**