ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 模板消息

Browse Source
This commit is contained in:
liao
2023-10-17 14:47:00 +08:00
parent c4eb09c409
commit 29626aea40
5 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/handle/DingDingSendMsgHandle.java
+30
View File
@@ -0,0 +1,30 @@
package com.jero.modules.docking.hiwork.handle;
import com.jero.common.util.SpringContextUtils;
import com.jero.modules.docking.hiwork.service.IHiworkMsgService;
import com.jero.modules.message.handle.ISendMsgHandle;
import lombok.extern.slf4j.Slf4j;
import java.util.Arrays;
import java.util.List;
/**
* @Author: liao
* @Date: 2023/10/17 14:29
* @Description: Hiwork钉钉消息
**/
@Slf4j
public class DingDingSendMsgHandle implements ISendMsgHandle {
/**
* @Author: liao
* @Date: 2023/10/17 14:29
* @Description: Hiwork钉钉消息
**/
@Override
public void SendMsg(String esReceiver, String esTitle, String esContent) {
IHiworkMsgService hiworkMsgService = SpringContextUtils.getBean(IHiworkMsgService.class);
hiworkMsgService.sendDingDingMsg(Arrays.asList(esReceiver.split(",")), esTitle, esContent);
}
}
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/handle/SystemSendMsgHandle.java
+21
View File
@@ -0,0 +1,21 @@
package com.jero.modules.docking.hiwork.handle;
import com.jero.common.util.SpringContextUtils;
import com.jero.modules.docking.hiwork.service.IHiworkMsgService;
import com.jero.modules.message.handle.ISendMsgHandle;
import lombok.extern.slf4j.Slf4j;
import java.util.Arrays;
@Slf4j
public class SystemSendMsgHandle implements ISendMsgHandle {
@Override
public void SendMsg(String esReceiver, String esTitle, String esContent) {
IHiworkMsgService hiworkMsgService = SpringContextUtils.getBean(IHiworkMsgService.class);
// 消息类型（暂未确定）
String messageType = "";
hiworkMsgService.sendSystemMsg(Arrays.asList(esReceiver.split(",")), messageType, esTitle, esContent);
}
}
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/IHiworkMsgService.java
+1 -1
View File
@@ -29,5 +29,5 @@ public interface IHiworkMsgService {
* title：消息标题
* content：消息内容
**/
void sendSystemMsg(String senderId, List<String> receiverIdList, String messageType, String title, String content);
void sendSystemMsg(List<String> receiverIdList, String messageType, String title, String content);
}
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkMsgServiceImpl.java
+6 -8
View File
@@ -3,6 +3,7 @@ package com.jero.modules.docking.hiwork.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.docking.hiwork.entity.HiworkDingDingMsg;
import com.jero.modules.docking.hiwork.entity.HiworkSystemMsg;
import com.jero.modules.docking.hiwork.service.IHiworkMsgService;
@@ -12,6 +13,7 @@ import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -82,21 +84,17 @@ public class HiworkMsgServiceImpl implements IHiworkMsgService {
* content：消息内容
**/
@Override
public void sendSystemMsg(String senderId, List<String> receiverIdList, String messageType, String title, String content) {
public void sendSystemMsg(List<String> receiverIdList, String messageType, String title, String content) {
HiworkSystemMsg hiworkSystemMsg = new HiworkSystemMsg();
// 异步系统标识
hiworkSystemMsg.setSysCode(HiworkPostUtil.getSysCode());
if (StringUtils.isBlank(senderId)) {
throw new JeroBootException(ResultCommon.EMPTY_COMMON, "senderId");
}
SysUser senderUser = sysUserService.getById(senderId);
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 发送人员编号
hiworkSystemMsg.setSendCode(senderUser.getUsername());
hiworkSystemMsg.setSendCode(loginUser.getUsername());
// 发送人员姓名
hiworkSystemMsg.setSendName(senderUser.getRealname());
hiworkSystemMsg.setSendName(loginUser.getRealname());
// 消息类型
hiworkSystemMsg.setMessageType(messageType);
// 消息标题
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java
+10 -16
View File
@@ -2,21 +2,19 @@ package com.jero.modules.docking.hiwork.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.docking.hiwork.dto.SendMessageDTO;
import com.jero.modules.docking.hiwork.service.IHiworkMsgService;
import com.jero.modules.docking.hiwork.handle.DingDingSendMsgHandle;
import com.jero.modules.docking.hiwork.handle.SystemSendMsgHandle;
import com.jero.modules.docking.hiwork.service.ISendMessageService;
import com.jero.modules.message.entity.SysMessageTemplate;
import com.jero.modules.message.handle.ISendMsgHandle;
import com.jero.modules.message.service.ISysMessageTemplateService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -32,8 +30,6 @@ public class SendMessageServiceImpl implements ISendMessageService {
@Resource
private ISysMessageTemplateService sysMessageTemplateService;
@Autowired
private IHiworkMsgService hiworkMsgService;
/**
* @Author: liao
@@ -65,20 +61,18 @@ public class SendMessageServiceImpl implements ISendMessageService {
sysMessageTemplate.getTemplateContent().replace("${" + k + "}", v)));
}
List<String> toUserIdList = Arrays.asList(sendMessageDTO.getToUserId().split(","));
ISendMsgHandle sendMsgHandle;
if ("5".equals(sysMessageTemplate.getTemplateType())) {
// Hiwork钉钉消息
hiworkMsgService.sendDingDingMsg(toUserIdList, sysMessageTemplate.getTemplateName(),
sysMessageTemplate.getTemplateContent());
sendMsgHandle = new DingDingSendMsgHandle();
} else if ("6".equals(sysMessageTemplate.getTemplateType())) {
// Hiwork系统消息
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 消息类型（暂未确定）
String messageType = "";
hiworkMsgService.sendSystemMsg(loginUser.getId(), toUserIdList,messageType,
sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent());
sendMsgHandle = new SystemSendMsgHandle();
} else {
return;
}
sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent());
log.info(sysMessageTemplate.getTemplateContent());
} catch (Exception e){
log.error("发送消息异常",e);