From 66277eda5e72283171b0c6365b88785775e0836c Mon Sep 17 00:00:00 2001 From: liao Date: Wed, 15 Nov 2023 16:15:17 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/message/handle/impl/SmsSendMsgHandle.java | 4 ++++ .../docking/hiwork/service/impl/HiworkMsgServiceImpl.java | 6 ++++++ .../docking/hiwork/service/impl/SendMessageServiceImpl.java | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/message/handle/impl/SmsSendMsgHandle.java b/laws-module-system/src/main/java/com/jero/modules/message/handle/impl/SmsSendMsgHandle.java index 4b6051ec..ef20c9b4 100644 --- a/laws-module-system/src/main/java/com/jero/modules/message/handle/impl/SmsSendMsgHandle.java +++ b/laws-module-system/src/main/java/com/jero/modules/message/handle/impl/SmsSendMsgHandle.java @@ -1,5 +1,6 @@ package com.jero.modules.message.handle.impl; +import com.alibaba.fastjson.JSONObject; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.SpringContextUtils; import com.jero.common.util.UUIDUtils; @@ -30,6 +31,9 @@ public class SmsSendMsgHandle implements ISendMsgHandle { sysAnnouncement.setSendTime(new Date()); sysAnnouncement.setDelFlag("0"); sysAnnouncement.setUserIds(esReceiver); + + log.info("发送Local系统消息: {}", JSONObject.toJSONString(sysAnnouncement)); + bean.saveAnnouncement(sysAnnouncement); } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkMsgServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkMsgServiceImpl.java index 8290e97a..08f2e12b 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkMsgServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkMsgServiceImpl.java @@ -11,6 +11,7 @@ import com.jero.modules.docking.hiwork.util.HiworkPostUtil; import com.jero.common.api.vo.ResultCommon; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; @@ -28,6 +29,7 @@ import java.util.stream.Collectors; * @Description: 统一消息集成 */ @Service +@Slf4j public class HiworkMsgServiceImpl implements IHiworkMsgService { @Autowired @@ -70,6 +72,8 @@ public class HiworkMsgServiceImpl implements IHiworkMsgService { msgJsonObject.put(TEXT, textJsonObject); hiworkDingDingMsg.setMsg(msgJsonObject); + log.info("发送Hiwork钉钉消息: {}", JSONObject.toJSONString(hiworkDingDingMsg)); + hiworkPostUtil.postDingDingMsg(hiworkDingDingMsg); } @@ -124,6 +128,8 @@ public class HiworkMsgServiceImpl implements IHiworkMsgService { msgJsonObject.put(TEXT, textJsonObject); hiworkSystemMsg.setMsg(msgJsonObject); + log.info("发送Hiwork系统消息: {}", JSONObject.toJSONString(hiworkSystemMsg)); + hiworkPostUtil.postSystemMsg(hiworkSystemMsg); } } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java index f8eadfdc..6ccb259d 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendMessageServiceImpl.java @@ -68,6 +68,7 @@ public class SendMessageServiceImpl implements SendMessageAPI { List typeList = Arrays.asList(sysMessageTemplate.getTemplateType().split(",")); typeList.forEach(type -> { + log.info("消息标题:{},消息内容:{},消息类型:{}", sysMessageTemplate.getTemplateName(),sysMessageTemplate.getTemplateContent(), type); ISendMsgHandle sendMsgHandle; if ("5".equals(type)) { // Hiwork钉钉消息 @@ -84,7 +85,6 @@ public class SendMessageServiceImpl implements SendMessageAPI { } else { return; } - log.info("消息标题:{},消息内容:{},消息类型:{}", sysMessageTemplate.getTemplateName(),sysMessageTemplate.getTemplateContent(), type); if (isSend) { sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent()); }