xuhy
16 小时以前 ba41bb92586d22f04db000c3cbd134bbc6df77bd
防火墙修改
3个文件已修改
43 ■■■■■ 已修改文件
manage/src/main/java/com/jilongda/manage/authority/controller/SecResourcesController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/authority/controller/SecRoleController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/authority/controller/SecUserController.java 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/authority/controller/SecResourcesController.java
@@ -46,7 +46,7 @@
    }
    @ApiOperation(value = "获取所有资源(菜单及功能)", notes = "获取所有资源(菜单及功能)")
    @PostMapping(value = "/dist")
    @GetMapping(value = "/listAll")
    public ApiResult<List<SecResourceVO>> listAll() {
        List<SecResourceVO> sysResourceVos = secResourcesService.selectResources();
        return ApiResult.success(sysResourceVos);
manage/src/main/java/com/jilongda/manage/authority/controller/SecRoleController.java
@@ -72,8 +72,8 @@
    }
    @ApiOperation(value = "获取角色权限---无层级", notes = "获取角色权限无层级,传递角色id即可")
    @PutMapping(value = "/resource/nolevel")
    public ApiResult<List<SecResources>> roleResourceNolevel(@RequestParam Long rid) {
    @GetMapping(value = "/resource/noLevel")
    public ApiResult<List<SecResources>> roleResourceNoLevel(@RequestParam Long rid) {
        List<SecRoleResource> secRoleResources = secRoleResourceMapper.selectList(Wrappers.lambdaQuery(SecRoleResource.class).eq(SecRoleResource::getRoleId, rid));
        List<SecResources> secResources = new ArrayList<>();
        if (!CollectionUtils.isEmpty(secRoleResources)) {
@@ -107,7 +107,7 @@
        List<SecRole> records = secRoleIPage.getRecords();
        records.stream().forEach(record -> {
//            List<SecUserRole> secUserRoles = secUserRoleMapper.selectList(Wrappers.lambdaQuery(SecUserRole.class).eq(SecUserRole::getRoleId, record.getId()));
            ApiResult<List<SecResources>> listApiResult = this.roleResourceNolevel(record.getId());
            ApiResult<List<SecResources>> listApiResult = this.roleResourceNoLevel(record.getId());
            List<SecResources> data = listApiResult.getData();
            record.setSecResourceVOS(data);
            List<SecUser> secUsers = secUserService.getUserByRoleId(record.getId());
manage/src/main/java/com/jilongda/manage/authority/controller/SecUserController.java
@@ -15,15 +15,10 @@
import com.jilongda.manage.authority.dto.SecUserDTO;
import com.jilongda.manage.authority.dto.SecUserRoleDTO;
import com.jilongda.manage.authority.dto.SecUsersDTO;
import com.jilongda.manage.authority.model.SecResources;
import com.jilongda.manage.authority.model.SecRole;
import com.jilongda.manage.authority.model.SecUser;
import com.jilongda.manage.authority.model.SecUserRole;
import com.jilongda.manage.authority.mapper.SecRoleResourceMapper;
import com.jilongda.manage.authority.model.*;
import com.jilongda.manage.authority.query.SecUserLowerQuery;
import com.jilongda.manage.authority.service.SecResourcesService;
import com.jilongda.manage.authority.service.SecRoleService;
import com.jilongda.manage.authority.service.SecUserRoleService;
import com.jilongda.manage.authority.service.SecUserService;
import com.jilongda.manage.authority.service.*;
import com.jilongda.manage.authority.vo.SecResourceVO;
import com.jilongda.manage.authority.vo.SecUsersVO;
import com.jilongda.manage.model.TOptometrist;
@@ -85,9 +80,10 @@
    private final SecUserRoleService secUserRoleService;
    private final LoginInfoUtil loginInfoUtil;
    private final RedisAutoTemplate redisAutoTemplate;
    private final SecRoleResourceService secRoleResourceService;
    @Autowired
    public SecUserController(SecUserService secUserService, SecRoleService secRoleService, SecResourcesService secResourcesService, PasswordEncoder passwordEncoder, UserUtil userUtil, SecUserRoleService secUserRoleService, LoginInfoUtil loginInfoUtil, RedisAutoTemplate redisAutoTemplate) {
    public SecUserController(SecUserService secUserService, SecRoleService secRoleService, SecResourcesService secResourcesService, PasswordEncoder passwordEncoder, UserUtil userUtil, SecUserRoleService secUserRoleService, LoginInfoUtil loginInfoUtil, RedisAutoTemplate redisAutoTemplate, SecRoleResourceService secRoleResourceService) {
        this.secUserService = secUserService;
        this.secRoleService = secRoleService;
        this.secResourcesService = secResourcesService;
@@ -96,6 +92,7 @@
        this.secUserRoleService = secUserRoleService;
        this.loginInfoUtil = loginInfoUtil;
        this.redisAutoTemplate = redisAutoTemplate;
        this.secRoleResourceService = secRoleResourceService;
    }
@@ -404,5 +401,25 @@
        return ApiResult.success();
    }
    @ApiOperation(value = "获取所有资源(菜单及功能)", notes = "获取所有资源(菜单及功能)")
    @GetMapping(value = "/listAll")
    public ApiResult<List<SecResourceVO>> listAll() {
        List<SecResourceVO> sysResourceVos = secResourcesService.selectResources();
        return ApiResult.success(sysResourceVos);
    }
    @ApiOperation(value = "获取角色权限---无层级", notes = "获取角色权限无层级,传递角色id即可")
    @GetMapping(value = "/resource/noLevel")
    public ApiResult<List<SecResources>> roleResourceNoLevel(@RequestParam Long rid) {
        List<SecRoleResource> secRoleResources = secRoleResourceService.list(Wrappers.lambdaQuery(SecRoleResource.class).eq(SecRoleResource::getRoleId, rid));
        List<SecResources> secResources = new ArrayList<>();
        if (!CollectionUtils.isEmpty(secRoleResources)) {
            List<Long> resIds = secRoleResources.stream().map(SecRoleResource::getResourceId).collect(Collectors.toList());
            secResources = secResourcesService.list(Wrappers.lambdaQuery(SecResources.class).in(SecResources::getId, resIds));
        }
        return ApiResult.success(secResources);
    }
}