Merge branch 'dev_20230210_dtd' into dev_20230130_mast

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/system/SystemResourceinterface.java

+package com.hungraim.ltc.pojo.entity.system;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("LTC_RESOURCE_INTERFACE")
+public class SystemResourceinterface {
+    private Long resourceId;
+    private Long interfaceId;
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/system/ReqUserInfo.java

@@ -22,5 +22,7 @@ public class ReqUserInfo {
 
     private Long organId;
     private Long srvOrganId;
+    private String organName;
+    private String srvOrganName;
 
 }

gateway-service/src/main/java/com/hungraim/ltc/gateway/security/AuthorizationManager.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.hungraim.ltc.constant.AuthConstants;
 import com.hungraim.ltc.pojo.entity.system.SystemInterface;
+import com.hungraim.ltc.pojo.entity.system.SystemRoleResource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,14 +88,14 @@ public class AuthorizationManager implements ReactiveAuthorizationManager<Author
                     String[] splitpath = path.split("/");
                     String pathNew = "/" + splitpath[1] + "/" + splitpath[2] + "/*";
                     Set<String> authorities = new HashSet<>();
-                    Map<String, List<Long>> rolesResources = redisTemplate.opsForHash().entries(AuthConstants.PERMISSION_ROLES_RESOURCE_KEY);
-                    Map<String, List<SystemInterface>> interfaces = redisTemplate.opsForHash().entries(AuthConstants.PERMISSION_RESOURCE_INTERFACE_KEY);
-                    List<Long> resources = rolesResources.get(roleId);
-                    for (Long resource  : resources) {
-                        List<SystemInterface> systemInterfaces = interfaces.get(resource.toString());
+                    Map<String, List<SystemRoleResource>> rolesResources = redisTemplate.opsForHash().entries(AuthConstants.PERMISSION_ROLES_RESOURCE_KEY);
+                    Map<String, List<String>> interfaces = redisTemplate.opsForHash().entries(AuthConstants.PERMISSION_RESOURCE_INTERFACE_KEY);
+                    List<SystemRoleResource> resources = rolesResources.get(roleId);
+                    for (SystemRoleResource resource  : resources) {
+                        List<String> systemInterfaces = interfaces.get(resource.getResourceId().toString());
                         if (systemInterfaces != null && systemInterfaces.size() > 0) {
-                            for (SystemInterface iter : systemInterfaces) {
-                                if (pathMatcher.match(iter.getInterfaceUrl(), pathNew)) {
+                            for (String iter : systemInterfaces) {
+                                if (pathMatcher.match(iter, pathNew)) {
                                     authorities.addAll(Convert.toList(String.class, roleId));
                                 }
                             }

system/system-admin-service/src/main/java/com/hungraim/ltc/component/InitResourceRoleCacheRunner.java

@@ -25,6 +25,6 @@ public class InitResourceRoleCacheRunner implements CommandLineRunner {
 
   @Override
   public void run(String... args) {
-    resourceService.refreshPermissionRolesCache();
+   // resourceService.refreshPermissionRolesCache();
   }
 }

system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/UserController.java

@@ -5,6 +5,8 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hungraim.ltc.constant.Gender;
+import com.hungraim.ltc.pojo.entity.disable.ChFndOrgan;
+import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.system.SystemUser;
 import com.hungraim.ltc.pojo.entity.system.SystemUserRole;
 import com.hungraim.ltc.pojo.vo.system.ReqUserInfo;
@@ -16,6 +18,7 @@ import com.hungraim.ltc.system.service.impl.SystemUserServiceImpl;
 import com.hungraim.ltc.util.CheckStrength;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
+import com.hungraim.ltc.util.TokenParsingUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -172,7 +175,9 @@ public class UserController {
      * @return
      */
     @PostMapping("/queryUsers")
-    public Result queryUsers(ReqUserInfo reqUserInfo) {
+    public Result queryUsers(@RequestHeader("Authorization") String token,ReqUserInfo reqUserInfo) {
+        long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId");
+        long organId = TokenParsingUtil.TokenParsing(token, "organId");
 
         QueryWrapper<SystemUser> systemUserQueryWrapper = new QueryWrapper<>();
         if (!StrUtil.isBlankIfStr(reqUserInfo.getName())) {
@@ -185,7 +190,16 @@ public class UserController {
         if (!StrUtil.isBlankIfStr(reqUserInfo.getEnable())) {
             systemUserQueryWrapper.and(wrapper -> wrapper.lambda().eq(SystemUser::getUserStatus, reqUserInfo.getEnable()));
         }
+        if (srvOrganId!=0) {
+            systemUserQueryWrapper.and(wrapper -> wrapper.lambda().eq(SystemUser::getSrvOrganId, srvOrganId));
+        }
+        if (organId!=0) {
+            systemUserQueryWrapper.and(wrapper -> wrapper.lambda().eq(SystemUser::getOrganId, organId));
+        }
         List<SystemUser> users = userInfoService.list(systemUserQueryWrapper);
+        List<ChFndOrgan> chFndOrganList = userInfoService.fndAllOrgans();
+        List<ChSrvOrgan> chSrvOrganList = userInfoService.srvOrganLists();
+
         List<ReqUserInfo> resUsers = users.stream().map(user -> {
             ReqUserInfo userInfo = new ReqUserInfo();
             userInfo.setId(user.getUserId());
@@ -196,6 +210,12 @@ public class UserController {
             userInfo.setGender(Gender.MAN.getCode().equals(user.getGender()) ? Gender.MAN.getDesc() : Gender.WOMAN.getDesc());
             userInfo.setOrganId(user.getOrganId());
             userInfo.setSrvOrganId(user.getSrvOrganId());
+            if(userInfo.getOrganId()!=null && userInfo.getOrganId()>0 && userInfo.getSrvOrganId()!=null && !userInfo.getSrvOrganId().equals("0")){
+                List<ChFndOrgan> collect = chFndOrganList.stream().filter(chFndOrgan -> chFndOrgan.getOrganId().equals(user.getOrganId().toString())).collect(Collectors.toList());
+                List<ChSrvOrgan> chSrvOrgans = chSrvOrganList.stream().filter(chSrvOrgan -> chSrvOrgan.getSrvOrganId().equals(user.getSrvOrganId().intValue())).collect(Collectors.toList());
+                userInfo.setOrganName(collect.get(0).getOrganName());
+                userInfo.setSrvOrganName(chSrvOrgans.get(0).getSrvOrganName());
+            }
             return userInfo;
         }).collect(Collectors.toList());
         return Result.success(resUsers);

system/system-admin-service/src/main/java/com/hungraim/ltc/system/dao/SystemInterfaceMapper.java

@@ -3,6 +3,8 @@ package com.hungraim.ltc.system.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.system.SystemInterface;
 import com.hungraim.ltc.pojo.entity.system.SystemResource;
+import com.hungraim.ltc.pojo.entity.system.SystemResourceinterface;
+import com.hungraim.ltc.pojo.entity.system.SystemRoleResource;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
@@ -14,14 +16,17 @@ import java.util.List;
 @Mapper
 public interface SystemInterfaceMapper extends BaseMapper<SystemInterface> {
 
-    @Select("SELECT a.INTERFACE_ID,a.INTERFACE_URL FROM LTC_INTERFACE a,LTC_RESOURCE_INTERFACE e where a.INTERFACE_ID=e.INTERFACE_ID and e.RESOURCE_ID=#{resourceId}")
-    List<SystemInterface> listInterface(Long resourceId);
+    @Select("SELECT a.INTERFACE_ID,a.INTERFACE_URL FROM LTC_INTERFACE a")
+    List<SystemInterface> listInterface();
+
+    @Select("select c.RESOURCE_ID,c.INTERFACE_ID from LTC_RESOURCE_INTERFACE c")
+    List<SystemResourceinterface>  listResourceInterface();
 
     @Select("select b.ROLE_ID from LTC_ROLE b")
     List<Long>  listRole();
 
-    @Select("select c.RESOURCE_ID from LTC_ROLE_RESOURCE c WHERE c.ROLE_ID=#{roleId}")
-    List<Long>  listRoleResource(Long roleId);
+    @Select("select c.RESOURCE_ID,c.ROLE_ID from LTC_ROLE_RESOURCE c")
+    List<SystemRoleResource>  listRoleResource();
 
 
 }

system/system-admin-service/src/main/java/com/hungraim/ltc/system/dao/SystemUserMapper.java

@@ -2,8 +2,13 @@ package com.hungraim.ltc.system.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.disable.ChFndOrgan;
+import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.system.SystemUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 用户
@@ -12,4 +17,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SystemUserMapper extends BaseMapper<SystemUser> {
 
+    @Select("select ORGAN_ID,ORGAN_NAME from CH_FND_ORGAN")
+    List<ChFndOrgan> fndAllOrgans();
+
+    @Select("select SRV_ORGAN_ID,SRV_ORGAN_NAME from CH_SRV_ORGAN")
+    List<ChSrvOrgan> srvOrganLists();
+
+
 }

system/system-admin-service/src/main/java/com/hungraim/ltc/system/service/ISystemUserService.java

 package com.hungraim.ltc.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hungraim.ltc.pojo.entity.disable.ChFndOrgan;
+import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.system.SystemUser;
 
+import java.util.List;
+
 /**
  * @author hubin
  */
 public interface ISystemUserService extends IService<SystemUser> {
 
+    List<ChFndOrgan> fndAllOrgans();
+
+
+    List<ChSrvOrgan> srvOrganLists();
+
 }

system/system-admin-service/src/main/java/com/hungraim/ltc/system/service/impl/SystemInterfaceServiceImpl.java

@@ -3,6 +3,8 @@ package com.hungraim.ltc.system.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hungraim.ltc.constant.AuthConstants;
 import com.hungraim.ltc.pojo.entity.system.SystemInterface;
+import com.hungraim.ltc.pojo.entity.system.SystemResourceinterface;
+import com.hungraim.ltc.pojo.entity.system.SystemRoleResource;
 import com.hungraim.ltc.system.dao.SystemInterfaceMapper;
 import com.hungraim.ltc.system.service.ISystemInterfaceService;
 import lombok.extern.slf4j.Slf4j;
@@ -11,6 +13,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author mq
@@ -34,29 +37,39 @@ public class SystemInterfaceServiceImpl extends ServiceImpl<SystemInterfaceMappe
 
     @Override
     public void listResourceInterface() {
-        try {
+
             redisTemplate.delete(AuthConstants.PERMISSION_RESOURCE_INTERFACE_KEY);
             redisTemplate.delete(AuthConstants.PERMISSION_ROLES_RESOURCE_KEY);
-            Map<String, List<Long>> roleResourcesMap = new TreeMap<>();
-            Map<String, List<SystemInterface>> stringStringHashMap = new HashMap<>();
+            Map<String, List<SystemRoleResource>> roleResourcesMap = new TreeMap<>();
+            Map<String, List<String>> stringStringHashMap = new HashMap<>();
+            //角色数据
             List<Long> roles = systemInterfaceMapper.listRole();
-            String roleId;
-            for (Long  role : roles) {
-                List<Long> roleResources = systemInterfaceMapper.listRoleResource(role);
-                //保存资源和接口
-                for (Long roleResource:roleResources){
-                    List<SystemInterface> systemInterfaces=systemInterfaceMapper.listInterface(roleResource);
-                    stringStringHashMap.put(roleResource.toString(),systemInterfaces);
-                }
-                // 转换 roles -> ROLE_{roleId}
-                roleId=AuthConstants.AUTHORITY_PREFIX + role;
-                //保存角色和资源
-                roleResourcesMap.put(roleId,roleResources);
-            }
+            //角色和资源数据
+            List<SystemRoleResource> roleResources = systemInterfaceMapper.listRoleResource();
+            //资源和接口数据
+            List<SystemResourceinterface> resourceInterface = systemInterfaceMapper.listResourceInterface();
+            //接口数据
+            List<SystemInterface> systemInterfaces = systemInterfaceMapper.listInterface();
+            roles.stream().forEach(role -> {
+                //角色和资源数据
+                List<SystemRoleResource> roleResourceList = roleResources.stream().filter(roleResource -> roleResource.getRoleId().equals(role)).collect(Collectors.toList());
+                roleResourceList.stream().forEach(roleResource -> {
+                    //资源和接口数据
+                    List<SystemResourceinterface> resourceinterfaceList = resourceInterface.stream().filter(role2 -> role2.getResourceId().equals(roleResource.getResourceId())).collect(Collectors.toList());
+                    List<String> systemResourceinterfaces = new ArrayList<>();
+                        resourceinterfaceList.stream().forEach(resourceinterface->{
+                            List<SystemInterface> collect = systemInterfaces.stream().filter(role2 -> role2.getInterfaceId().equals(resourceinterface.getInterfaceId())).collect(Collectors.toList());
+                            systemResourceinterfaces.add(collect.get(0).getInterfaceUrl());
+                        });
+                     //资源和接口
+                    stringStringHashMap.put(roleResource.getResourceId().toString(),systemResourceinterfaces);
+
+                    });
+                //角色和资源
+                roleResourcesMap.put(AuthConstants.AUTHORITY_PREFIX + role.toString(),roleResourceList);
+                });
             redisTemplate.opsForHash().putAll(AuthConstants.PERMISSION_ROLES_RESOURCE_KEY, roleResourcesMap);
             redisTemplate.opsForHash().putAll(AuthConstants.PERMISSION_RESOURCE_INTERFACE_KEY, stringStringHashMap);
-        }catch (RuntimeException e){
-            e.printStackTrace();
-        }
+
     }
 }

system/system-admin-service/src/main/java/com/hungraim/ltc/system/service/impl/SystemUserServiceImpl.java

@@ -2,6 +2,8 @@ package com.hungraim.ltc.system.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hungraim.ltc.pojo.entity.disable.ChFndOrgan;
+import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.system.SystemUser;
 import com.hungraim.ltc.system.dao.SystemUserMapper;
 import com.hungraim.ltc.system.dao.SystemUserRoleMapper;
@@ -9,6 +11,7 @@ import com.hungraim.ltc.system.service.ISystemUserService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @author hubin
@@ -23,4 +26,13 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
     private SystemUserRoleMapper userRoleMapper;
 
 
+    @Override
+    public List<ChFndOrgan> fndAllOrgans() {
+        return userMapper.fndAllOrgans();
+    }
+
+    @Override
+    public List<ChSrvOrgan> srvOrganLists() {
+        return userMapper.srvOrganLists();
+    }
 }