From 7b3ebd00674ea46b9411979f1ca37cc65bc6cd02 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 26 Mar 2024 14:19:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20hiwork=E6=B6=88=E6=81=AF=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E4=B8=8D=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HiworkMsgServiceImpl.java | 8 +-- .../service/impl/SendMessageServiceImpl.java | 52 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) 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 0351c155..c5b2d013 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 @@ -82,7 +82,7 @@ public class HiworkMsgServiceImpl implements IHiworkMsgService { log.info("发送Hiwork钉钉消息: {}", JSONObject.toJSONString(hiworkDingDingMsg)); - hiworkPostUtil.postDingDingMsg(hiworkDingDingMsg); +// hiworkPostUtil.postDingDingMsg(hiworkDingDingMsg); } /** @@ -107,8 +107,6 @@ public class HiworkMsgServiceImpl implements IHiworkMsgService { hiworkSystemMsg.setSendCode(loginUser.getUsername()); // 发送人员姓名 hiworkSystemMsg.setSendName(loginUser.getRealname()); - // 消息类型 - hiworkSystemMsg.setMessageType(messageType); // 消息标题 hiworkSystemMsg.setTitle(title); @@ -134,15 +132,17 @@ public class HiworkMsgServiceImpl implements IHiworkMsgService { textJsonObject.put(CONTENT, content); if (StrUtil.isBlank(messageUrl)) { msgJsonObject.put(MSG_TYPE, TEXT); + hiworkSystemMsg.setMessageType("01"); } else { msgJsonObject.put(MSG_TYPE, LINK); textJsonObject.put("messageUrl", messageUrl); + hiworkSystemMsg.setMessageType("04"); } msgJsonObject.put(TEXT, textJsonObject); hiworkSystemMsg.setMsg(msgJsonObject); log.info("发送Hiwork系统消息: {}", JSONObject.toJSONString(hiworkSystemMsg)); - hiworkPostUtil.postSystemMsg(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 ad92d60d..ca96e3ee 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 @@ -53,17 +53,17 @@ public class SendMessageServiceImpl implements SendMessageAPI { **/ @Override public void sendMessage(SendMessageDTO sendMessageDTO) { - if(StringUtils.isEmpty(sendMessageDTO.getToUserId())){ + if (StringUtils.isEmpty(sendMessageDTO.getToUserId())) { throw new JeroBootException("消息接收人id不能为空"); } - if(StringUtils.isEmpty(sendMessageDTO.getTemplateCode())){ + if (StringUtils.isEmpty(sendMessageDTO.getTemplateCode())) { throw new JeroBootException("消息模板编码不能为空!"); } LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(SysMessageTemplate::getTemplateCode,sendMessageDTO.getTemplateCode()); + query.eq(SysMessageTemplate::getTemplateCode, sendMessageDTO.getTemplateCode()); List sysSmsTemplates = sysMessageTemplateService.list(query); - if(CollectionUtils.isEmpty(sysSmsTemplates)){ + if (CollectionUtils.isEmpty(sysSmsTemplates)) { throw new JeroBootException("消息模板不存在"); } SysMessageTemplate sysMessageTemplate = sysSmsTemplates.get(0); @@ -73,9 +73,9 @@ public class SendMessageServiceImpl implements SendMessageAPI { try { // 替换模板内容 - if(!Objects.isNull(sendMessageDTO.getMap())){ - Map map = sendMessageDTO.getMap(); - map.forEach((k,v)-> sysMessageTemplate.setTemplateContent( + if (!Objects.isNull(sendMessageDTO.getMap())) { + Map map = sendMessageDTO.getMap(); + map.forEach((k, v) -> sysMessageTemplate.setTemplateContent( sysMessageTemplate.getTemplateContent().replace("${" + k + "}", v))); if (null != map.get("openType")) { openType = map.get("openType"); @@ -96,26 +96,13 @@ public class SendMessageServiceImpl implements SendMessageAPI { String finalOpenType = openType; String finalOpenPage = openPage; typeList.forEach(type -> { - log.info("消息标题:{},消息内容:{},消息类型:{}", sysMessageTemplate.getTemplateName(),sysMessageTemplate.getTemplateContent(), type); + log.info("消息标题:{},消息内容:{},消息类型:{}", sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent(), type); ISendMsgHandle sendMsgHandle; if ("5".equals(type)) { // Hiwork钉钉消息 sendMsgHandle = new DingDingSendMsgHandle(); - } else if ("6".equals(type)) { - // Hiwork系统消息 - sendMsgHandle = new SystemSendMsgHandle(); - } else if ("4".equals(type)) { - // 普通系统消息 - sendMsgHandle = new SmsSendMsgHandle(); - if (!isSend) { - sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent(), finalOpenType, finalOpenPage); - } - } else { - return; - } - if (isHiworkDingDingSend) { - String messageUrl = hiworkUrlPrefix + finalOpenPage; - if (sendMsgHandle instanceof DingDingSendMsgHandle) { + if (isHiworkDingDingSend) { + String messageUrl = hiworkUrlPrefix + finalOpenPage; // 将tempUrl编码 String encodeUrl = null; try { @@ -124,12 +111,25 @@ public class SendMessageServiceImpl implements SendMessageAPI { throw new JeroBootException("钉钉消息跳转url编码异常", e); } messageUrl = dingdingUrlPrefix + encodeUrl + "&pc_slide=true"; + sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent(), finalOpenType, messageUrl); + } + } else if ("6".equals(type)) { + // Hiwork系统消息 + sendMsgHandle = new SystemSendMsgHandle(); + if (isHiworkDingDingSend) { + String messageUrl = hiworkUrlPrefix + finalOpenPage; + sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent(), finalOpenType, messageUrl); + } + } else if ("4".equals(type)) { + // 普通系统消息 + sendMsgHandle = new SmsSendMsgHandle(); + if (isSend) { + sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent(), finalOpenType, finalOpenPage); } - sendMsgHandle.SendMsg(sendMessageDTO.getToUserId(), sysMessageTemplate.getTemplateName(), sysMessageTemplate.getTemplateContent(), finalOpenType, messageUrl); } }); - } catch (Exception e){ - log.error("发送消息异常",e); + } catch (Exception e) { + log.error("发送消息异常", e); throw new JeroBootException("发送消息异常"); }