From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/util/UserRoleClient.java | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/util/UserRoleClient.java b/src/main/java/com/highdatas/mdm/util/UserRoleClient.java
index c12c6e6..2a559b1 100644
--- a/src/main/java/com/highdatas/mdm/util/UserRoleClient.java
+++ b/src/main/java/com/highdatas/mdm/util/UserRoleClient.java
@@ -7,6 +7,7 @@
import com.highdatas.mdm.entity.TUser;
import com.highdatas.mdm.entity.TUserGroup;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.http.HttpMethod;
@@ -14,10 +15,7 @@
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@ConfigurationProperties(prefix = "user")
@Component
@@ -28,12 +26,20 @@
String url;
String prefix ;
+ @Autowired
+ RedisClient redisClient;
public UserRoleClient() {
this.prefix = "/api/datacvg/";
}
public TUser getTUserById(String userId) {
+ Object redisValObj = redisClient.getRedisValObj(RedisClient.getRealRedisKey(userId));
+ if (redisValObj != null) {
+ JSONObject object = (JSONObject) redisValObj;
+ TUser user = JSONObject.parseObject(object.toJSONString(), TUser.class);
+ return user;
+ }
String url = this.url + prefix + "user/selectUser";
Map<String, String> params = new LinkedHashMap<>();
params.put("userId",userId);
@@ -50,11 +56,18 @@
if (user == null){
return null;
}
+ redisClient.putRedisValObj(RedisClient.getRealRedisKey(userId), user);
return user;
}
}
public TRole getRoleByRoleId(String roleId) {
+ Object redisValObj = redisClient.getRedisValObj(RedisClient.getRealRedisKey(roleId));
+ if (redisValObj != null) {
+ JSONObject object = (JSONObject) redisValObj;
+ TRole user = JSONObject.parseObject(object.toJSONString(), TRole.class);
+ return user;
+ }
try {
String url = this.url + prefix + "role/selectRole";
Map<String, String> params = new LinkedHashMap<>();
@@ -70,6 +83,7 @@
if (role == null){
return null;
}
+ redisClient.putRedisValObj(RedisClient.getRealRedisKey(roleId), role);
return role;
}
}catch (Exception e){
@@ -80,6 +94,19 @@
}
public List<TUserGroup> getUserGroupByUserId(String userId) {
+
+ String key = RedisClient.getRealRedisKey(userId + "-getUserGroupByUserId");
+ List<Object> redisList = redisClient.getRedisList(key);
+ if (redisList != null && !redisList.isEmpty()) {
+ List<TUserGroup> result = new ArrayList<>();
+ for (Object o : redisList) {
+ JSONObject object = (JSONObject) o;
+ TUserGroup menu = JSONObject.parseObject(object.toJSONString(), TUserGroup.class);
+ result.add(menu);
+ }
+ return result;
+ }
+
String url = this.url + prefix + "group/userGroupInfo";
Map<String, Object> params = new LinkedHashMap<>();
params.put("userId",userId);
@@ -95,11 +122,24 @@
if (tUserGroups == null || tUserGroups.isEmpty()) {
return null;
}
+ redisClient.putRedisList(key, (tUserGroups));
return tUserGroups;
}
}
public List<TRole> getTRoleListByUserId(String userId) {
+
+ String key = RedisClient.getRealRedisKey(userId + "-getTRoleListByUserId");
+ List<Object> redisList = redisClient.getRedisList(key);
+ if (redisList != null && !redisList.isEmpty()) {
+ List<TRole> result = new ArrayList<>();
+ for (Object o : redisList) {
+ JSONObject object = (JSONObject) o;
+ TRole menu = JSONObject.parseObject(object.toJSONString(), TRole.class);
+ result.add(menu);
+ }
+ return result;
+ }
String url = this.url + prefix + "userRole/selectUserRoleList";
Map<String, String> params = new LinkedHashMap<>();
params.put("userId",userId);
@@ -114,11 +154,23 @@
if (tRoles == null || tRoles.isEmpty()) {
return null;
}
+ redisClient.putRedisList(key, tRoles);
return tRoles;
}
}
public List<TRole> getRoleListByGroupId(String groupId) {
+ String key = RedisClient.getRealRedisKey(groupId + "-getTRoleListByUserId");
+ List<Object> redisList = redisClient.getRedisList(key);
+ if (redisList != null && !redisList.isEmpty()) {
+ List<TRole> result = new ArrayList<>();
+ for (Object o : redisList) {
+ JSONObject object = (JSONObject) o;
+ TRole menu = JSONObject.parseObject(object.toJSONString(), TRole.class);
+ result.add(menu);
+ }
+ return result;
+ }
try {
String url = this.url + prefix + "group/groupRoleInfo";
Map<String, Object> params = new LinkedHashMap<>();
@@ -135,6 +187,7 @@
if (role == null || role.isEmpty()){
return null;
}
+ redisClient.putRedisList(key, role);
return role;
}
}catch (Exception e){
@@ -249,6 +302,15 @@
}
public List<String> getUserListByRole(String roleId) {
+ String key = RedisClient.getRealRedisKey(roleId + "-getUserListByRole");
+ List<Object> redisList = redisClient.getRedisList(key);
+ if (redisList != null && !redisList.isEmpty()) {
+ List<String> result = new ArrayList<>();
+ for (Object o : redisList) {
+ result.add(o.toString());
+ }
+ return result;
+ }
try {
String url = this.url + prefix + "userRole/selectUserMap";
Map<String, Object> params = new LinkedHashMap<>();
@@ -261,6 +323,7 @@
}
List<String> array = result.getObject(Constant.Data, List.class);
+ redisClient.putRedisList(key,array);
return array;
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.8.0