From 0871084c84ba4a2733b6bca3a524567e70974703 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Mon, 23 Jun 2025 13:36:54 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1=E5=8A=A8=E6=80=81=E6=A8=A1?= =?UTF-8?q?=E7=89=88=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/system/api/RemoteSubmailConfigService.java | 2 +- .../system/dubbo/RemoteSubmailConfigServiceImpl.java | 6 +++--- .../dromara/system/service/ISysSubmailConfigService.java | 2 +- .../system/service/impl/SysSubmailConfigServiceImpl.java | 8 +++++++- .../dromara/workflow/service/impl/FlwTaskServiceImpl.java | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dk-api/api-system/src/main/java/org/dromara/system/api/RemoteSubmailConfigService.java b/dk-api/api-system/src/main/java/org/dromara/system/api/RemoteSubmailConfigService.java index 9f4677e..b122cbf 100644 --- a/dk-api/api-system/src/main/java/org/dromara/system/api/RemoteSubmailConfigService.java +++ b/dk-api/api-system/src/main/java/org/dromara/system/api/RemoteSubmailConfigService.java @@ -35,6 +35,6 @@ public interface RemoteSubmailConfigService { * @param userId * @param noticeMap */ - void remoteSendUser(String code,List userId,Map noticeMap); + void remoteSendUser(String code,List userId,Map noticeMap,String project); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteSubmailConfigServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteSubmailConfigServiceImpl.java index f982ce3..8cc1c5e 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteSubmailConfigServiceImpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteSubmailConfigServiceImpl.java @@ -60,7 +60,7 @@ public class RemoteSubmailConfigServiceImpl implements RemoteSubmailConfigServic Long deptId = Convert.toLong(map.get("deptId")); List sysUserVos = userService.selectUserListByDept(Convert.toLong(deptId)); Set phones = sysUserVos.stream().filter(u -> u.getNoticeType() == 1 && StrUtil.isNotEmpty(u.getPhonenumber())).map(SysUserVo::getPhonenumber).collect(Collectors.toSet()); - sysSubmailConfigService.sendPhone(code,phones, JSON.toJSONString(map)); + sysSubmailConfigService.sendPhone(code,phones, JSON.toJSONString(map),null); } } @@ -74,7 +74,7 @@ public class RemoteSubmailConfigServiceImpl implements RemoteSubmailConfigServic * @param noticeMap */ @Override - public void remoteSendUser(String code, List userIds, Map noticeMap) { + public void remoteSendUser(String code, List userIds, Map noticeMap,String project) { userIds.forEach(userId -> { SysUserVo sysUserVo = userService.selectUserById(userId); @@ -83,7 +83,7 @@ public class RemoteSubmailConfigServiceImpl implements RemoteSubmailConfigServic Set phones = new HashSet<>(); phones.add(sysUserVo.getPhonenumber()); - sysSubmailConfigService.sendPhone(code,phones, JSON.toJSONString(noticeMap)); + sysSubmailConfigService.sendPhone(code,phones, JSON.toJSONString(noticeMap),project); } }); diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/ISysSubmailConfigService.java b/dk-modules/system/src/main/java/org/dromara/system/service/ISysSubmailConfigService.java index 01a7223..d54a742 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/ISysSubmailConfigService.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/ISysSubmailConfigService.java @@ -72,7 +72,7 @@ public interface ISysSubmailConfigService { R cmdSend(String code, String multiParam); - R sendPhone(String code,Setphones, String multiParam); + R sendPhone(String code,Setphones, String multiParam,String project); String submailSendUtil(SysSubmailConfigBo bo, List configUserVoList); String submailSendPhone(SysSubmailConfigBo bo, Set phones); diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysSubmailConfigServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysSubmailConfigServiceImpl.java index 5bed240..ca963b7 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysSubmailConfigServiceImpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysSubmailConfigServiceImpl.java @@ -3,6 +3,7 @@ package org.dromara.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.util.BooleanUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONArray; @@ -187,7 +188,7 @@ public class SysSubmailConfigServiceImpl implements ISysSubmailConfigService { } @Override - public R sendPhone(String code, Set phones, String multiParam) { + public R sendPhone(String code, Set phones, String multiParam,String project) { //找到生效配置 SysSubmailConfigBo bo = new SysSubmailConfigBo(); bo.setCode(code); @@ -197,6 +198,11 @@ public class SysSubmailConfigServiceImpl implements ISysSubmailConfigService { } SysSubmailConfigVo firstConfigVo = sysSubmailConfigVoTempList.get(0); + //如果模版不为空则使用传过来的模版 + if (ObjectUtil.isNotEmpty(project)){ + firstConfigVo.setProject(project); + } + BeanUtil.copyProperties(firstConfigVo,bo); bo.setMultiParam(multiParam); diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 42cc31f..c5d37a0 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -243,7 +243,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { //发送短信是否属于指派 if(completeTaskBo.getAssign()){ - remoteSubmailConfigService.remoteSendUser("smsMultixsend",List.of(Long.valueOf(completeTaskBo.getHandler())),noticeMap); + remoteSubmailConfigService.remoteSendUser("smsMultixsend",List.of(Long.valueOf(completeTaskBo.getHandler())),noticeMap,"kKv7s3"); }