update 发送消息
This commit is contained in:
+4
@@ -1,5 +1,6 @@
|
|||||||
package com.jero.modules.message.handle.impl;
|
package com.jero.modules.message.handle.impl;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.jero.common.system.vo.LoginUser;
|
import com.jero.common.system.vo.LoginUser;
|
||||||
import com.jero.common.util.SpringContextUtils;
|
import com.jero.common.util.SpringContextUtils;
|
||||||
import com.jero.common.util.UUIDUtils;
|
import com.jero.common.util.UUIDUtils;
|
||||||
@@ -30,6 +31,9 @@ public class SmsSendMsgHandle implements ISendMsgHandle {
|
|||||||
sysAnnouncement.setSendTime(new Date());
|
sysAnnouncement.setSendTime(new Date());
|
||||||
sysAnnouncement.setDelFlag("0");
|
sysAnnouncement.setDelFlag("0");
|
||||||
sysAnnouncement.setUserIds(esReceiver);
|
sysAnnouncement.setUserIds(esReceiver);
|
||||||
|
|
||||||
|
log.info("发送Local系统消息: {}", JSONObject.toJSONString(sysAnnouncement));
|
||||||
|
|
||||||
bean.saveAnnouncement(sysAnnouncement);
|
bean.saveAnnouncement(sysAnnouncement);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+6
@@ -11,6 +11,7 @@ import com.jero.modules.docking.hiwork.util.HiworkPostUtil;
|
|||||||
import com.jero.common.api.vo.ResultCommon;
|
import com.jero.common.api.vo.ResultCommon;
|
||||||
import com.jero.modules.system.entity.SysUser;
|
import com.jero.modules.system.entity.SysUser;
|
||||||
import com.jero.modules.system.service.ISysUserService;
|
import com.jero.modules.system.service.ISysUserService;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.collections4.CollectionUtils;
|
import org.apache.commons.collections4.CollectionUtils;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
@@ -28,6 +29,7 @@ import java.util.stream.Collectors;
|
|||||||
* @Description: 统一消息集成
|
* @Description: 统一消息集成
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
|
@Slf4j
|
||||||
public class HiworkMsgServiceImpl implements IHiworkMsgService {
|
public class HiworkMsgServiceImpl implements IHiworkMsgService {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
@@ -70,6 +72,8 @@ public class HiworkMsgServiceImpl implements IHiworkMsgService {
|
|||||||
msgJsonObject.put(TEXT, textJsonObject);
|
msgJsonObject.put(TEXT, textJsonObject);
|
||||||
hiworkDingDingMsg.setMsg(msgJsonObject);
|
hiworkDingDingMsg.setMsg(msgJsonObject);
|
||||||
|
|
||||||
|
log.info("发送Hiwork钉钉消息: {}", JSONObject.toJSONString(hiworkDingDingMsg));
|
||||||
|
|
||||||
hiworkPostUtil.postDingDingMsg(hiworkDingDingMsg);
|
hiworkPostUtil.postDingDingMsg(hiworkDingDingMsg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,6 +128,8 @@ public class HiworkMsgServiceImpl implements IHiworkMsgService {
|
|||||||
msgJsonObject.put(TEXT, textJsonObject);
|
msgJsonObject.put(TEXT, textJsonObject);
|
||||||
hiworkSystemMsg.setMsg(msgJsonObject);
|
hiworkSystemMsg.setMsg(msgJsonObject);
|
||||||
|
|
||||||
|
log.info("发送Hiwork系统消息: {}", JSONObject.toJSONString(hiworkSystemMsg));
|
||||||
|
|
||||||
hiworkPostUtil.postSystemMsg(hiworkSystemMsg);
|
hiworkPostUtil.postSystemMsg(hiworkSystemMsg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -68,6 +68,7 @@ public class SendMessageServiceImpl implements SendMessageAPI {
|
|||||||
|
|
||||||
List<String> typeList = Arrays.asList(sysMessageTemplate.getTemplateType().split(","));
|
List<String> typeList = Arrays.asList(sysMessageTemplate.getTemplateType().split(","));
|
||||||
typeList.forEach(type -> {
|
typeList.forEach(type -> {
|
||||||
|
log.info("消息标题:{},消息内容:{},消息类型:{}", sysMessageTemplate.getTemplateName(),sysMessageTemplate.getTemplateContent(), type);
|
||||||
ISendMsgHandle sendMsgHandle;
|
ISendMsgHandle sendMsgHandle;
|
||||||
if ("5".equals(type)) {
|
if ("5".equals(type)) {
|
||||||
// Hiwork钉钉消息
|
// Hiwork钉钉消息
|
||||||
@@ -84,7 +85,6 @@ public class SendMessageServiceImpl implements SendMessageAPI {
|
|||||||
} else {
|
} else {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
log.info("消息标题:{},消息内容:{},消息类型:{}", sysMessageTemplate.getTemplateName(),sysMessageTemplate.getTemplateContent(), type);
|
|
||||||
if (isSend) {
|
if (isSend) {
|
||||||
sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent());
|
sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user