From 394a0de1f2db9249527afb2b084999fad2a9dced Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 23 一月 2026 09:47:14 +0800
Subject: [PATCH] 消息通知去掉租户id相关参数
---
src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java | 145 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 133 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
index 2b0191d..bf794b5 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
@@ -1,7 +1,27 @@
package com.ruoyi.project.system.service.impl;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.xiaoymin.knife4j.core.util.StrUtil;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.SysUserDept;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import com.ruoyi.project.system.domain.SysNotice;
import com.ruoyi.project.system.mapper.SysNoticeMapper;
@@ -9,18 +29,31 @@
/**
* 鍏憡 鏈嶅姟灞傚疄鐜�
- *
+ *
* @author ruoyi
*/
@Service
-public class SysNoticeServiceImpl implements ISysNoticeService
-{
+public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {
+
@Autowired
private SysNoticeMapper noticeMapper;
+ @Autowired
+ private SysUserMapper userMapper;
+
+ @Autowired
+ private SysDeptMapper deptMapper;
+
+ @Autowired
+ private SysUserDeptMapper userDeptMapper;
+
+ @Autowired
+ @Lazy
+ private ISysNoticeService sysNoticeService;
+
/**
* 鏌ヨ鍏憡淇℃伅
- *
+ *
* @param noticeId 鍏憡ID
* @return 鍏憡淇℃伅
*/
@@ -32,19 +65,18 @@
/**
* 鏌ヨ鍏憡鍒楄〃
- *
+ *
* @param notice 鍏憡淇℃伅
* @return 鍏憡闆嗗悎
*/
@Override
- public List<SysNotice> selectNoticeList(SysNotice notice)
- {
- return noticeMapper.selectNoticeList(notice);
+ public IPage<SysNotice> selectNoticeList(SysNotice notice, Page page) {
+ return noticeMapper.selectNoticeList(notice, page);
}
/**
* 鏂板鍏憡
- *
+ *
* @param notice 鍏憡淇℃伅
* @return 缁撴灉
*/
@@ -56,7 +88,7 @@
/**
* 淇敼鍏憡
- *
+ *
* @param notice 鍏憡淇℃伅
* @return 缁撴灉
*/
@@ -68,7 +100,7 @@
/**
* 鍒犻櫎鍏憡瀵硅薄
- *
+ *
* @param noticeId 鍏憡ID
* @return 缁撴灉
*/
@@ -80,7 +112,7 @@
/**
* 鎵归噺鍒犻櫎鍏憡淇℃伅
- *
+ *
* @param noticeIds 闇�瑕佸垹闄ょ殑鍏憡ID
* @return 缁撴灉
*/
@@ -89,4 +121,93 @@
{
return noticeMapper.deleteNoticeByIds(noticeIds);
}
+
+ @Override
+ public Long getCount(Long consigneeId) {
+ return noticeMapper.selectCount(Wrappers.<SysNotice>lambdaQuery()
+ .eq(SysNotice::getStatus, "0")
+ .eq(SysNotice::getConsigneeId, consigneeId));
+ }
+
+ @Override
+ public int readAll() {
+ Long userId = SecurityUtils.getUserId();
+ return noticeMapper.update(null, Wrappers.<SysNotice>lambdaUpdate()
+ .eq(SysNotice::getConsigneeId, userId)
+ .eq(SysNotice::getStatus, "0")
+ .set(SysNotice::getStatus, "1"));
+ }
+
+ @Override
+ public void simpleNoticeByUser(String title, String message, List<Long> consigneeId, String jumpPath) {
+ Long userId = SecurityUtils.getLoginUser().getUserId();
+ Long tenantId = SecurityUtils.getLoginUser().getTenantId();
+ List<SysNotice> sysNotices = consigneeId.stream().map(it -> convertSysNotice(title, message, it,tenantId, jumpPath, userId)).collect(Collectors.toList());
+ sysNoticeService.saveBatch(sysNotices);
+ }
+
+ @Override
+ public void simpleNoticeAll(String title, String message, String jumpPath) {
+ Long userId = SecurityUtils.getLoginUser().getUserId();
+ if (userId == null) {
+ return;
+ }
+ Long rootDeptId = SecurityUtils.getLoginUser().getTenantId();
+ // 鏌ユ墍鏈夊瓙閮ㄩ棬
+ List<SysDept> childrenDepts = deptMapper.selectChildrenDeptById(rootDeptId);
+
+ // 缁勮 deptIds
+ List<Long> deptIds = childrenDepts.stream()
+ .map(SysDept::getDeptId)
+ .collect(Collectors.toList());
+ deptIds.add(rootDeptId);
+
+ // 鏌ョ敤鎴稩D
+ List<Long> userIds = userDeptMapper.selectList(
+ Wrappers.<SysUserDept>lambdaQuery()
+ .in(SysUserDept::getDeptId, deptIds)
+ ).stream()
+ .map(SysUserDept::getUserId)
+ .distinct()
+ .collect(Collectors.toList());
+
+ if (userIds.isEmpty()) {
+ return;
+ }
+
+ // 鏌ョ敤鎴�
+ List<SysUser> sysUsers = userMapper.selectList(
+ Wrappers.<SysUser>lambdaQuery()
+ .eq(SysUser::getStatus, "0")
+ .in(SysUser::getUserId, userIds)
+ );
+
+ // 鍙戦�氱煡
+ List<SysNotice> collect = sysUsers.stream()
+ .map(it -> convertSysNotice(
+ title,
+ message,
+ it.getUserId(),
+ it.getTenantId(),
+ jumpPath,
+ userId
+ ))
+ .collect(Collectors.toList());
+
+ sysNoticeService.saveBatch(collect);
+ }
+
+
+ private SysNotice convertSysNotice(String title,String message,Long consigneeId, Long tenantId,String jumpPath,Long currentUserId) {
+ SysNotice sysNotice = new SysNotice();
+ sysNotice.setNoticeType("1");
+ sysNotice.setNoticeTitle(title);//鏍囬
+ sysNotice.setNoticeContent(message);
+ sysNotice.setStatus("0");
+ sysNotice.setConsigneeId(consigneeId);
+ sysNotice.setSenderId(currentUserId);
+ sysNotice.setJumpPath(jumpPath);
+ sysNotice.setTenantId(tenantId);
+ return sysNotice;
+ }
}
--
Gitblit v1.9.3