From 645fe0426017b280aa107b9363d37dc85470601b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 12 一月 2026 17:17:50 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New
---
src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java | 126 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 114 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..79a5750 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,20 @@
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.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.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 +22,25 @@
/**
* 鍏憡 鏈嶅姟灞傚疄鐜�
- *
+ *
* @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
+ @Lazy
+ private ISysNoticeService sysNoticeService;
+
/**
* 鏌ヨ鍏憡淇℃伅
- *
+ *
* @param noticeId 鍏憡ID
* @return 鍏憡淇℃伅
*/
@@ -32,19 +52,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 +75,7 @@
/**
* 淇敼鍏憡
- *
+ *
* @param notice 鍏憡淇℃伅
* @return 缁撴灉
*/
@@ -68,7 +87,7 @@
/**
* 鍒犻櫎鍏憡瀵硅薄
- *
+ *
* @param noticeId 鍏憡ID
* @return 缁撴灉
*/
@@ -80,7 +99,7 @@
/**
* 鎵归噺鍒犻櫎鍏憡淇℃伅
- *
+ *
* @param noticeIds 闇�瑕佸垹闄ょ殑鍏憡ID
* @return 缁撴灉
*/
@@ -89,4 +108,87 @@
{
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 simpleNoticeByRoles(final String title, String message, Long tenantId, List<String> needPushRoles,
+ final String jumpPath) {
+ Long userId = SecurityUtils.getUserId();
+ if (StrUtil.isBlank(message) || CollectionUtils.isEmpty(needPushRoles)) {
+ return;
+ }
+ List<String> rolesWithAdmin = new ArrayList<>(needPushRoles);
+ rolesWithAdmin.add("绠＄悊鍛�");
+ List<SysNotice> collect = rolesWithAdmin.stream()
+ .flatMap(it -> userMapper.getUserByRole(it).stream())
+ .map(it -> convertSysNotice(title, message, it,tenantId, jumpPath, userId))
+ .collect(Collectors.toList());
+ sysNoticeService.insertBatch(collect);
+ }
+
+ @Override
+ public void simpleNoticeByPerms(String title, String message, Long tenantId, List<String> needPerms,
+ String jumpPath) {
+ Long userId = SecurityUtils.getLoginUser().getUserId();
+ if (StrUtil.isBlank(message) || CollectionUtils.isEmpty(needPerms)) {
+ return;
+ }
+ List<SysNotice> collect = userMapper.getUserByPerms(needPerms).stream().map(it -> convertSysNotice(title, message, it,tenantId, jumpPath, userId)).collect(Collectors.toList());
+ sysNoticeService.insertBatch(collect);
+ }
+
+ @Override
+ public void simpleNoticeByUser(String title, String message, List<Long> consigneeId, Long tenantId,
+ String jumpPath) {
+ Long userId = SecurityUtils.getLoginUser().getUserId();
+ 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, Long tenantId,String jumpPath) {
+ Long userId = SecurityUtils.getLoginUser().getUserId();
+ List<SysNotice> collect = userMapper.selectList(null).stream().map(it -> convertSysNotice(title, message, it.getUserId(),tenantId, jumpPath, userId)).collect(Collectors.toList());
+ sysNoticeService.saveBatch(collect);
+ }
+
+ @Override
+ public void insertBatch(List<SysNotice> noticesList) {
+ if(CollectionUtils.isEmpty(noticesList)){
+ return;
+ }
+ // 鎺掗櫎鎺夎嚜宸�
+ Long userId = SecurityUtils.getUserId();
+ List<SysNotice> noticesListNew = noticesList.stream().filter(Objects::nonNull).filter(it -> !Objects.equals(it.getConsigneeId(), userId)).collect(Collectors.toList());
+ sysNoticeService.saveBatch(noticesListNew);
+
+ }
+
+ 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