Commit 31cbe5f2 authored by hkl's avatar hkl

feat:1.修改调整目录后报错

parent d52bc4e3
...@@ -22,10 +22,6 @@ ...@@ -22,10 +22,6 @@
<artifactId>TinyPinyin</artifactId> <artifactId>TinyPinyin</artifactId>
<version>2.0.3.RELEASE</version> <version>2.0.3.RELEASE</version>
</dependency> </dependency>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-system-local-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
......
...@@ -24,14 +24,14 @@ import java.util.Date; ...@@ -24,14 +24,14 @@ import java.util.Date;
import java.util.Map; import java.util.Map;
/** /**
* @Description: 发送系统消息 * @Description: 发送系统消息
* @Author: wangshuai * @Author: wangshuai
* @Date: 2022年3月22日 18:48:20 * @Date: 2022年3月22日 18:48:20
*/ */
@Component("systemSendMsgHandle") @Component("systemSendMsgHandle")
public class SystemSendMsgHandle implements ISendMsgHandle { public class SystemSendMsgHandle implements ISendMsgHandle {
public static final String FROM_USER="system"; public static final String FROM_USER = "system";
@Resource @Resource
private SysAnnouncementMapper sysAnnouncementMapper; private SysAnnouncementMapper sysAnnouncementMapper;
...@@ -47,22 +47,24 @@ public class SystemSendMsgHandle implements ISendMsgHandle { ...@@ -47,22 +47,24 @@ public class SystemSendMsgHandle implements ISendMsgHandle {
/** /**
* 该方法会发送3种消息:系统消息、企业微信 钉钉 * 该方法会发送3种消息:系统消息、企业微信 钉钉
*
* @param esReceiver 发送人 * @param esReceiver 发送人
* @param esTitle 标题 * @param esTitle 标题
* @param esContent 内容 * @param esContent 内容
*/ */
@Override @Override
public void sendMsg(String esReceiver, String esTitle, String esContent) { public void sendMsg(String esReceiver, String esTitle, String esContent) {
if(oConvertUtils.isEmpty(esReceiver)){ if (oConvertUtils.isEmpty(esReceiver)) {
throw new JeecgBootException("被发送人不能为空"); throw new JeecgBootException("被发送人不能为空");
} }
ISysBaseAPI sysBaseApi = SpringContextUtils.getBean(ISysBaseAPI.class); ISysBaseAPI sysBaseApi = SpringContextUtils.getBean(ISysBaseAPI.class);
MessageDTO messageDTO = new MessageDTO(FROM_USER,esReceiver,esTitle,esContent); MessageDTO messageDTO = new MessageDTO(FROM_USER, esReceiver, esTitle, esContent);
sysBaseApi.sendSysAnnouncement(messageDTO); sysBaseApi.sendSysAnnouncement(messageDTO);
} }
/** /**
* 仅发送系统消息 * 仅发送系统消息
*
* @param messageDTO * @param messageDTO
*/ */
@Override @Override
...@@ -71,24 +73,24 @@ public class SystemSendMsgHandle implements ISendMsgHandle { ...@@ -71,24 +73,24 @@ public class SystemSendMsgHandle implements ISendMsgHandle {
String title = messageDTO.getTitle(); String title = messageDTO.getTitle();
String content = messageDTO.getContent(); String content = messageDTO.getContent();
String fromUser = messageDTO.getFromUser(); String fromUser = messageDTO.getFromUser();
Map<String,Object> data = messageDTO.getData(); Map<String, Object> data = messageDTO.getData();
String[] arr = messageDTO.getToUser().split(","); String[] arr = messageDTO.getToUser().split(",");
for(String username: arr){ for (String username : arr) {
doSend(title, content, fromUser, username, data); doSend(title, content, fromUser, username, data);
} }
} }
private void doSend(String title, String msgContent, String fromUser, String toUser, Map<String, Object> data){ private void doSend(String title, String msgContent, String fromUser, String toUser, Map<String, Object> data) {
SysAnnouncement announcement = new SysAnnouncement(); SysAnnouncement announcement = new SysAnnouncement();
if(data!=null){ if (data != null) {
//摘要信息 //摘要信息
Object msgAbstract = data.get(CommonConstant.NOTICE_MSG_SUMMARY); Object msgAbstract = data.get(CommonConstant.NOTICE_MSG_SUMMARY);
if(msgAbstract!=null){ if (msgAbstract != null) {
announcement.setMsgAbstract(msgAbstract.toString()); announcement.setMsgAbstract(msgAbstract.toString());
} }
// 任务节点ID // 任务节点ID
Object taskId = data.get(CommonConstant.NOTICE_MSG_BUS_ID); Object taskId = data.get(CommonConstant.NOTICE_MSG_BUS_ID);
if(taskId!=null){ if (taskId != null) {
announcement.setBusId(taskId.toString()); announcement.setBusId(taskId.toString());
announcement.setBusType(Vue3MessageHrefEnum.BPM_TASK.getBusType()); announcement.setBusType(Vue3MessageHrefEnum.BPM_TASK.getBusType());
} }
...@@ -108,10 +110,10 @@ public class SystemSendMsgHandle implements ISendMsgHandle { ...@@ -108,10 +110,10 @@ public class SystemSendMsgHandle implements ISendMsgHandle {
String userId = toUser; String userId = toUser;
String[] userIds = userId.split(","); String[] userIds = userId.split(",");
String anntId = announcement.getId(); String anntId = announcement.getId();
for(int i=0;i<userIds.length;i++) { for (int i = 0; i < userIds.length; i++) {
if(oConvertUtils.isNotEmpty(userIds[i])) { if (oConvertUtils.isNotEmpty(userIds[i])) {
SysUser sysUser = userMapper.getUserByName(userIds[i]); SysUser sysUser = userMapper.getUserByName(userIds[i]);
if(sysUser==null) { if (sysUser == null) {
continue; continue;
} }
SysAnnouncementSend announcementSend = new SysAnnouncementSend(); SysAnnouncementSend announcementSend = new SysAnnouncementSend();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment