fix:87840

This commit is contained in:
梁琦涛
2024-07-31 19:18:57 +08:00
parent 9f35804bdc
commit 1cf2ef281c
17 changed files with 58 additions and 21 deletions
@@ -21,7 +21,7 @@ public class DingDingSendMsgHandle implements ISendMsgHandle {
* @Description: Hiwork钉钉消息
**/
@Override
public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String messageUrl) {
public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String messageUrl,String sendUser) {
IHiworkMsgService hiworkMsgService = SpringContextUtils.getBean(IHiworkMsgService.class);
hiworkMsgService.sendDingDingMsg(Arrays.asList(esReceiver.split(",")), esTitle, esContent, messageUrl);
}
@@ -23,7 +23,7 @@ import javax.annotation.Resource;
public class SendFeiShuHandle implements ISendMsgHandle {
@Override
public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage) {
public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage,String sendUser) {
IFeiShuDockingService bean = SpringContextUtils.getBean(IFeiShuDockingService.class);
Environment env = SpringContextUtils.getBean(Environment.class);
BotMessageDto botMessageDto = new BotMessageDto();
@@ -11,11 +11,11 @@ import java.util.Arrays;
public class SystemSendMsgHandle implements ISendMsgHandle {
@Override
public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage) {
public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage,String sendUser) {
IHiworkMsgService hiworkMsgService = SpringContextUtils.getBean(IHiworkMsgService.class);
// TODO 先写死 01 消息类型(暂未确定)
String messageType = "01";
hiworkMsgService.sendSystemMsg(Arrays.asList(esReceiver.split(",")), messageType, esTitle, esContent, openPage);
hiworkMsgService.sendSystemMsg(Arrays.asList(esReceiver.split(",")), messageType, esTitle, esContent, openPage, sendUser);
}
}
@@ -29,5 +29,5 @@ public interface IHiworkMsgService {
* title:消息标题
* content:消息内容
**/
void sendSystemMsg(List<String> receiverIdList, String messageType, String title, String content, String messageUrl);
void sendSystemMsg(List<String> receiverIdList, String messageType, String title, String content, String messageUrl, String sendUser);
}
@@ -96,7 +96,7 @@ public class HiworkMsgServiceImpl implements IHiworkMsgService {
* content:消息内容
**/
@Override
public void sendSystemMsg(List<String> receiverIdList, String messageType, String title, String content, String messageUrl) {
public void sendSystemMsg(List<String> receiverIdList, String messageType, String title, String content, String messageUrl,String sendUser) {
HiworkSystemMsg hiworkSystemMsg = new HiworkSystemMsg();
// 异步系统标识
@@ -98,7 +98,7 @@ public class SendMessageServiceImpl implements SendMessageAPI {
log.info("消息标题:{},消息内容:{},消息类型:{}", sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent(), type);
if (isSend) {
SendMsgProcessor sp = new SendMsgProcessor();
sp.SendMsg(type, sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent(), finalOpenType, finalOpenPage);
sp.SendMsg(type, sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent(), finalOpenType, finalOpenPage,sendMessageDTO.getSendUser());
}
});
} catch (Exception e) {
@@ -22,11 +22,11 @@ public class SendMsgProcessor {
handlers.put("5", new SendFeiShuHandle());
}
public void SendMsg(String type, String esReceiver, String esTitle, String esContent, String openType, String openPage){
public void SendMsg(String type, String esReceiver, String esTitle, String esContent, String openType, String openPage,String sendUser){
ISendMsgHandle handler = handlers.get(type);
if (handler == null) {
throw new IllegalArgumentException("消息处理异常");
}
handler.SendMsg(esReceiver, esTitle, esContent, openType, openPage);
handler.SendMsg(esReceiver, esTitle, esContent, openType, openPage,sendUser);
}
}