diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesPrelimSchemeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesPrelimSchemeServiceImpl.java index fc08541a..b55121f2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesPrelimSchemeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesPrelimSchemeServiceImpl.java @@ -207,17 +207,14 @@ public class DesPrelimSchemeServiceImpl extends ServiceImpl(). eq(MsgConfig::getProjectId, prelimScheme.getProjectId()). eq(MsgConfig::getMsgKey, "prelimScheme") ); - System.out.println("2!!!!!!!!!!!!!!!!!!!!!!!"); if (msgConfig != null) { - System.out.println("3!!!!!!!!!!!!!!!!!!!!!!!"); String userId = msgConfig.getUserId(); List userIdList = Arrays.stream(userId.split(",")) .map(String::trim) @@ -231,7 +228,6 @@ public class DesPrelimSchemeServiceImpl extends ServiceImpl{ * 指定用户向指定用户发送消息 */ Boolean sendMsg(SendMsgDto bo); + + /** + * 发送消息 + */ + void sendMsg(Long projectId, Long detailsID,String type); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/impl/MsgNoticeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/impl/MsgNoticeServiceImpl.java index 10eef01c..a314031b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/impl/MsgNoticeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/service/impl/MsgNoticeServiceImpl.java @@ -25,6 +25,7 @@ import org.dromara.message.mapper.MsgNoticeMapper; import org.dromara.message.service.IMsgNoticeService; import java.util.*; +import java.util.stream.Collectors; /** * 消息Service业务层处理 @@ -168,6 +169,8 @@ public class MsgNoticeServiceImpl extends ServiceImpl(). + eq(MsgConfig::getProjectId, projectId). + eq(MsgConfig::getMsgKey, type) + ); + if (msgConfig != null) { + String userId = msgConfig.getUserId(); + List userIdList = Arrays.stream(userId.split(",")) + .map(String::trim) + .map(s -> { + try { + return Long.valueOf(s); + } catch (NumberFormatException e) { + // 处理转换失败的情况 + return null; // 或者根据需求处理 + } + }) + .filter(Objects::nonNull) // 过滤掉转换失败的null值 + .collect(Collectors.toList()); + //发送消息 + SendMsgDto sendMsgDto = new SendMsgDto(); + sendMsgDto.setProjectId(projectId); + sendMsgDto.setRecipientIds(userIdList); + sendMsgDto.setSenderId(0L); + sendMsgDto.setConfigId(msgConfig.getId()); + sendMsgDto.setDetailId(detailsID.toString()); + sendMsgDto.setContent(msgConfig.getMsgContent()); + this.sendMsg(sendMsgDto); + } + } }