From 8d0e312443876371e2be7ae9a2cb70e4f73bb2cd Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期日, 02 十月 2022 09:35:33 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java
index 1953b96..39a9145 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java
@@ -1,6 +1,7 @@
package com.ycl.service.user.impl;
import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.entity.user.UmsAdminRoleRelation;
@@ -10,7 +11,6 @@
import com.ycl.service.user.UmsAdminCacheService;
import com.ycl.service.user.UmsAdminRoleRelationService;
import com.ycl.service.user.UmsAdminService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -59,7 +59,7 @@
@Override
public void delResourceListByRole(Long roleId) {
QueryWrapper<UmsAdminRoleRelation> wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(UmsAdminRoleRelation::getRoleId,roleId);
+ wrapper.lambda().eq(UmsAdminRoleRelation::getRoleId, roleId);
List<UmsAdminRoleRelation> relationList = adminRoleRelationService.list(wrapper);
if (CollUtil.isNotEmpty(relationList)) {
String keyPrefix = REDIS_DATABASE + ":" + REDIS_KEY_RESOURCE_LIST + ":";
@@ -71,7 +71,7 @@
@Override
public void delResourceListByRoleIds(List<Long> roleIds) {
QueryWrapper<UmsAdminRoleRelation> wrapper = new QueryWrapper<>();
- wrapper.lambda().in(UmsAdminRoleRelation::getRoleId,roleIds);
+ wrapper.lambda().in(UmsAdminRoleRelation::getRoleId, roleIds);
List<UmsAdminRoleRelation> relationList = adminRoleRelationService.list(wrapper);
if (CollUtil.isNotEmpty(relationList)) {
String keyPrefix = REDIS_DATABASE + ":" + REDIS_KEY_RESOURCE_LIST + ":";
@@ -93,24 +93,40 @@
@Override
public UmsAdmin getAdmin(String username) {
String key = REDIS_DATABASE + ":" + REDIS_KEY_ADMIN + ":" + username;
- return (UmsAdmin) redisService.get(key);
+// return (UmsAdmin) redisService.get(key);
+ String result = (String) redisService.get(key);
+ UmsAdmin umsAdmin = JSON.parseObject(result, UmsAdmin.class);
+ return umsAdmin;
}
@Override
public void setAdmin(UmsAdmin admin) {
String key = REDIS_DATABASE + ":" + REDIS_KEY_ADMIN + ":" + admin.getUsername();
- redisService.set(key, admin, REDIS_EXPIRE);
+ redisService.set(key, JSON.toJSONString(admin), REDIS_EXPIRE);
}
@Override
public List<UmsResource> getResourceList(Long adminId) {
String key = REDIS_DATABASE + ":" + REDIS_KEY_RESOURCE_LIST + ":" + adminId;
- return (List<UmsResource>) redisService.get(key);
+ String s = (String) redisService.get(key);
+// return (List<UmsResource>) redisService.get(key);
+ List<UmsResource> umsResources = JSON.parseArray(s, UmsResource.class);
+ return umsResources;
}
@Override
public void setResourceList(Long adminId, List<UmsResource> resourceList) {
String key = REDIS_DATABASE + ":" + REDIS_KEY_RESOURCE_LIST + ":" + adminId;
- redisService.set(key, resourceList, REDIS_EXPIRE);
+ redisService.set(key, JSON.toJSONString(resourceList), REDIS_EXPIRE);
+ }
+
+ @Override
+ public void delBatchAdmin(List<Long> userIds) {
+ List<UmsAdmin> users = umsAdminService.listByIds(userIds);
+ if (CollUtil.isNotEmpty(users)) {
+ String keyPrefix = REDIS_DATABASE + ":" + REDIS_KEY_ADMIN + ":";
+ List<String> keys = users.stream().map(umsAdmin->keyPrefix+umsAdmin.getUsername()).collect(Collectors.toList());
+ redisService.del(keys);
+ }
}
}
--
Gitblit v1.8.0