From 811b14aa5cd2bd6d4313b43dc38ce87cd938f3b0 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期二, 23 七月 2024 17:12:42 +0800
Subject: [PATCH] 优化:通道同步任务 增加：根据用户统计未读总数
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 67dbedb..a37f029 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -9,13 +9,16 @@
import javax.annotation.Resource;
import javax.validation.Validator;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
import com.ruoyi.alarm.config.mapper.ArdAlarmTypeConfigMapper;
import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.mapper.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,11 +37,6 @@
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.mapper.SysPostMapper;
-import com.ruoyi.system.mapper.SysRoleMapper;
-import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.mapper.SysUserPostMapper;
-import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
@@ -75,6 +73,9 @@
private RedisCache redisCache;
@Resource
private ArdAlarmTypeConfigMapper ardAlarmTypeConfigMapper;
+
+ @Resource
+ private SysDeptMapper sysDeptMapper;
/**
* 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨
@@ -143,7 +144,7 @@
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
- @DataScope(deptAlias = "d", userAlias = "u")
+// @DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectAllAppUserList(SysUser user) {
return userMapper.selectAllAppUserList(user);
}
@@ -311,6 +312,7 @@
public int insertUser(SysUser user) {
// 鏂板鐢ㄦ埛淇℃伅
+ user.setUserId(IdUtils.simpleUUID());
int rows = userMapper.insertUser(user);
if (rows > 0) { //澧炲姞鐢ㄦ埛缂撳瓨
redisCache.setCacheObject(getCacheKey(user.getUserId()), user);
@@ -629,4 +631,20 @@
private String getCacheKey(String configKey) {
return CacheConstants.USER_LIST_KEY + configKey;
}
+
+
+ @Override
+ public List<SysUser> userByDeptList(List<Long> deptList) {
+ QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("dept_id",deptList);
+ return userMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public List<SysUser> userByDept(Long deptId) {
+ QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("dept_id",deptId).eq("del_flag","0").eq("app_user_type","1");
+ return userMapper.selectList(queryWrapper);
+ }
+
}
--
Gitblit v1.9.3