1.清理部分废弃接口

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovAccessFeignClient.java

@@ -20,21 +20,6 @@ import java.util.Set;
 @FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = MybatisGovAccessFeignClientFallback.class)
 public interface MybatisGovAccessFeignClient {
 
-    /**
-     * 查询角色的操作key对应操作范围列表
-     * @param operationScopeFormDTO
-     * @return
-     */
-    @PostMapping("/gov/access/access/operationscopes")
-    Result<Set<OperationScopeDTO>> getOperationScopesByRoleId(OperationScopeFormDTO operationScopeFormDTO);
-
-    /**
-     * 查询角色所有operation及其范围(缓存)
-     * @return
-     */
-    @PostMapping("/gov/access/access/roleallopesandscopes/{roleId}")
-    Result<List<RoleOpeScopeResultDTO>> listRoleAllOperationScopesByRoleId(@PathVariable("roleId") String roleId);
-
     /**
      * 查询sql过滤片段
      * @param form

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovAccessFeignClientFallback.java

@@ -21,16 +21,6 @@ import java.util.Set;
 @Component
 public class MybatisGovAccessFeignClientFallback implements MybatisGovAccessFeignClient {
 
-    @Override
-    public Result<Set<OperationScopeDTO>> getOperationScopesByRoleId(OperationScopeFormDTO operationScopeFormDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getOperationScopesByRoleId", operationScopeFormDTO);
-    }
-
-    @Override
-    public Result<List<RoleOpeScopeResultDTO>> listRoleAllOperationScopesByRoleId(@PathVariable("roleId") String roleId){
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "listRoleAllOperationScopesByRoleId", roleId);
-    }
-
     @Override
     public Result<String> getSqlFilterSegment(GetSQLFilterFormDTO form) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getSqlFilterSegment", form);

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java

@@ -3,12 +3,10 @@ package com.epmet.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.RoleOpeScopeResultDTO;
 import com.epmet.service.AccessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -24,67 +22,6 @@ public class AccessController {
     @Autowired
     private AccessService accessService;
 
-    /**
-     * 更新工作人员权限缓存(前端查询权限时候gov-mine会调用此处)
-     * @param staffPermCacheFormDTO
-     * @return
-     */
-    @PostMapping("updatepermissioncache")
-    public Result updatePermissionCache(@RequestBody StaffPermCacheFormDTO staffPermCacheFormDTO) {
-        ValidatorUtils.validateEntity(staffPermCacheFormDTO, StaffPermCacheFormDTO.UpdatePermissionCache.class);
-        String staffId = staffPermCacheFormDTO.getStaffId();
-        String app = staffPermCacheFormDTO.getApp();
-        String client = staffPermCacheFormDTO.getClient();
-        Set<String> permissions = staffPermCacheFormDTO.getPermissions();
-        Set<String> roleIdList = staffPermCacheFormDTO.getRoleIdList();
-        String orgId = staffPermCacheFormDTO.getOrgIdPath();
-        String gridId = staffPermCacheFormDTO.getGridId();
-        accessService.updatePermissionCache(staffId, app, client, permissions, roleIdList, orgId, gridId);
-        return new Result();
-    }
-
-    ///**
-    // * 从缓存中查询用户信息(DataFilterAspect中用到)
-    // * @return
-    // */
-    //@PostMapping("loginuserinfo")
-    //public Result<LoginUserInfoResultDTO> getLoginUserInfo(@RequestBody StaffPermCacheFormDTO dto) {
-    //    ValidatorUtils.validateEntity(dto, StaffPermCacheFormDTO.GetStaffCurrPermissions.class);
-    //    GovTokenDto govTokenDto = accessService.getUserDetails(dto.getApp(), dto.getClient(), dto.getStaffId());
-    //    LoginUserInfoResultDTO resultDTO = null;
-    //    if (govTokenDto != null) {
-    //        resultDTO = new LoginUserInfoResultDTO();
-    //        resultDTO.setRoleIdList(govTokenDto.getRoleIdList());
-    //        //resultDTO.setGridId(govTokenDto.getGridId());
-    //        resultDTO.setOrgIdPath(govTokenDto.getOrgIdPath());
-    //        resultDTO.setGridIdList(govTokenDto.getGridIdList());
-    //        resultDTO.setDeptIdList(govTokenDto.getDeptIdList());
-    //        resultDTO.setUserId(govTokenDto.getUserId());
-    //    }
-    //    return new Result<LoginUserInfoResultDTO>().ok(resultDTO);
-    //}
-
-    /**
-     * 查询角色的操作key对应操作范围列表(缓存)
-     * @return
-     */
-    @PostMapping("operationscopes")
-    public Result<Set<RoleOpeScopeResultDTO>> getOperationScopesByRoleId(@RequestBody OperationScopeFormDTO operationScopeFormDTO) {
-        ValidatorUtils.validateEntity(operationScopeFormDTO, OperationScopeFormDTO.ListOperationScopeGroup.class);
-        Set<RoleOpeScopeResultDTO> scopes = accessService.listOperationScopesByRoleId(operationScopeFormDTO.getRoleId(), operationScopeFormDTO.getOperationKey());
-        return new Result<Set<RoleOpeScopeResultDTO>>().ok(scopes);
-    }
-
-    /**
-     * 查询角色所有operation及其范围(缓存)
-     * @return
-     */
-    @PostMapping("roleallopesandscopes/{roleId}")
-    public Result<List<RoleOpeScopeResultDTO>> listRoleAllOperationScopesByRoleId(@PathVariable("roleId") String roleId) {
-        List<RoleOpeScopeResultDTO> scopes = accessService.listAllRoleOperationScopesByRoleId(roleId);
-        return new Result<List<RoleOpeScopeResultDTO>>().ok(scopes);
-    }
-
     /**
      * 用户是否具有指定功能权限
      * @return

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessService.java

@@ -1,21 +1,13 @@
 package com.epmet.service;
 
-import com.epmet.commons.tools.security.dto.GovTokenDto;
 import com.epmet.dto.form.GetSQLFilterFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.dto.result.RoleOpeScopeResultDTO;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 public interface AccessService {
-    /**
-     * 更新权限缓存
-     * @param staffId
-     * @param permissions
-     */
-    void updatePermissionCache(String staffId, String app, String client, Set<String> permissions, Set<String> roleIdList, String orgIdPath, String gridId);
 
     /**
      * 查询登陆用户登陆信息
@@ -23,14 +15,6 @@ public interface AccessService {
      */
     LoginUserDetailsResultDTO getLoginUserDetails(String app, String client, String staffId);
 
-    /**
-     * 查询角色的操作key对应操作范围列表
-     * @param roleId
-     * @param operationKey
-     * @return
-     */
-    Set<RoleOpeScopeResultDTO> listOperationScopesByRoleId(String roleId, String operationKey);
-
     /**
      * 查询角色所有operation及其范围(缓存)
      * @param roleId

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java

@@ -4,9 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.epmet.bean.OpeScopeFilterResultBean;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.security.dto.GovTokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.Result;
@@ -65,57 +63,11 @@ public class AccessServiceImpl implements AccessService {
     public static final String ORG_RELATION_SUP = "sup";
     public static final String ORG_PATH_SEPARATOR = ":";
 
-    /**
-     * 更新权限缓存
-     * @param staffId
-     * @param permissions
-     */
-    @Override
-    public void updatePermissionCache(String staffId, String app, String client, Set<String> permissions, Set<String> roleIdList,
-                                      String orgIdPath, String gridId) {
-        GovTokenDto govTokenDto = cpUserDetailRedis.get(app, client, staffId, GovTokenDto.class);
-        if (govTokenDto == null) {
-            logger.warn("更新[{}]用户缓存:Redis中不存在该用户TokenDto缓存信息", staffId);
-            return ;
-        }
-        // 将权限，角色列表，和当前组织ID存入TokenDto
-        govTokenDto.setPermissions(permissions);
-        govTokenDto.setRoleIdList(roleIdList);
-        govTokenDto.setOrgIdPath(orgIdPath);
-        govTokenDto.setGridId(gridId);
-
-        // 将新的TokenDto更新到redis中
-        long expire = cpUserDetailRedis.getExpire(app, client, staffId);
-        cpUserDetailRedis.set(govTokenDto, expire);
-        logger.warn("更新[{}]用户缓存成功。", staffId);
-    }
-
     @Override
     public LoginUserDetailsResultDTO getLoginUserDetails(String app, String client, String staffId) {
         return cpUserDetailRedis.get(app, client, staffId, LoginUserDetailsResultDTO.class);
     }
 
-    /**
-     * 查询角色的操作key对应操作范围列表
-     * @param roleId
-     * @param operationKey
-     * @return
-     */
-    public Set<RoleOpeScopeResultDTO> listOperationScopesByRoleId(String roleId, String operationKey) {
-        Set<RoleOpeScopeResultDTO> roleOpeScopes = roleOpeScopeRedis.getRoleOpeScopes(roleId, operationKey);
-        if (roleOpeScopes != null) {
-            return roleOpeScopes;
-        }
-        Set<RoleOpeScopeResultDTO> scopes = operationScopeDao.listOperationScopesByRoleId(roleId, operationKey);
-        try {
-            roleOpeScopeRedis.setRoleOpeScopes(roleId, operationKey, scopes);
-        } catch (Exception e) {
-            String errorStackTrace = ExceptionUtils.getErrorStackTrace(e);
-            logger.error("GovAccess:查询角色的操作范围:缓存范围出错:{}", errorStackTrace);
-        }
-        return scopes;
-    }
-
     @Override
     public List<RoleOpeScopeResultDTO> listAllRoleOperationScopesByRoleId(String roleId) {
         List<RoleOpeScopeResultDTO> roleAllOpeScopes = roleOpeScopeRedis.getRoleAllOpeScopes(roleId);

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovAccessFeignClient.java

@@ -2,19 +2,12 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.OperationScopeDTO;
 import com.epmet.dto.form.ListOpePermsFormDTO;
-import com.epmet.dto.form.OperationScopeFormDTO;
-import com.epmet.dto.form.StaffPermCacheFormDTO;
-import com.epmet.dto.result.RoleOpeScopeResultDTO;
-import com.epmet.dto.result.RoleOperationResultDTO;
 import com.epmet.feign.fallback.GovAccessFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -25,37 +18,6 @@ import java.util.Set;
 @FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = GovAccessFeignClientFallback.class)
 public interface GovAccessFeignClient {
 
-    /**
-     * 根据角色ID查询角色权限列表
-     * @param roleId
-     * @return
-     */
-    @PostMapping("/gov/access/role/operations/{roleId}")
-    Result<List<RoleOperationResultDTO>> listOperationsByRoleId(@PathVariable("roleId") String roleId);
-
-    /**
-     * 刷新用户权限缓存
-     * @param staffPermCacheFormDTO
-     * @return
-     */
-    @PostMapping("/gov/access/access/updatepermissioncache")
-    Result updatePermissionCache(@RequestBody StaffPermCacheFormDTO staffPermCacheFormDTO);
-
-    /**
-     * 查询角色的操作key对应操作范围列表
-     * @param operationScopeFormDTO
-     * @return
-     */
-    @PostMapping("/gov/access/access/operationscopes")
-    Result<Set<OperationScopeDTO>> getOperationScopesByRoleId(OperationScopeFormDTO operationScopeFormDTO);
-
-    /**
-     * 查询角色所有operation及其范围(缓存)
-     * @return
-     */
-    @PostMapping("/gov/access/access/roleallopesandscopes/{roleId}")
-    Result<List<RoleOpeScopeResultDTO>> listRoleAllOperationScopesByRoleId(@PathVariable("roleId") String roleId);
-
     /**
      * 列出觉得的功能权限列表
      * @return

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallback.java

@@ -3,17 +3,9 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.OperationScopeDTO;
 import com.epmet.dto.form.ListOpePermsFormDTO;
-import com.epmet.dto.form.OperationScopeFormDTO;
-import com.epmet.dto.form.StaffPermCacheFormDTO;
-import com.epmet.dto.result.RoleOpeScopeResultDTO;
-import com.epmet.dto.result.RoleOperationResultDTO;
 import com.epmet.feign.GovAccessFeignClient;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -23,31 +15,6 @@ import java.util.Set;
 @Component
 public class GovAccessFeignClientFallback implements GovAccessFeignClient {
 
-	@Override
-	public Result<List<RoleOperationResultDTO>> listOperationsByRoleId(String roleId) {
-		return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "listOperationsByRoleId");
-	}
-
-	/**
-	 * 刷新用户权限缓存
-	 * @param staffPermCacheFormDTO
-	 * @return
-	 */
-	@Override
-	public Result updatePermissionCache(@RequestBody StaffPermCacheFormDTO staffPermCacheFormDTO) {
-		return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "updatePermissionCache");
-	}
-
-	@Override
-	public Result<Set<OperationScopeDTO>> getOperationScopesByRoleId(OperationScopeFormDTO operationScopeFormDTO) {
-		return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getOperationScopesByRoleId", operationScopeFormDTO);
-	}
-
-	@Override
-	public Result<List<RoleOpeScopeResultDTO>> listRoleAllOperationScopesByRoleId(String roleId) {
-		return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "listRoleAllOperationScopesByRoleId", roleId);
-	}
-
 	@Override
 	public Result<Set<String>> listOperationPermissions(ListOpePermsFormDTO listOpePermsFormDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "listOperationPermissions", listOpePermsFormDTO);