From cc64cc5a473a130fef8a89684c35694e42f7570f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 28 Feb 2026 18:21:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(permission):=20=E6=9B=B4=E6=96=B0=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=A7=92=E8=89=B2API=E6=98=A0=E5=B0=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改数据库查询将table_name字段改为显示table_desc描述信息 - 注释掉getProductLines接口方法以优化代码结构 - 注释掉getUsers接口方法并将查询条件从id改为roleId - 在PermissionRoleApiMapVO中新增用户ID列表和产品线列表的转换逻辑 - 添加users和productLines字段的JSON忽略注解 - 实现字符串到整数列表和字符串到字符串列表的自动转换方法 --- .../controller/DataPermissionController.java | 56 +++++++++---------- .../pojo/vo/PermissionRoleApiMapVO.java | 34 ++++++++++- .../AdminPermissionRoleApiMapMapper.xml | 2 +- 3 files changed, 62 insertions(+), 30 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DataPermissionController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DataPermissionController.java index a0399a99..459068b0 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DataPermissionController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DataPermissionController.java @@ -189,20 +189,20 @@ public class DataPermissionController extends ControllerBase { return ApiResult.success(); } - /** - * 获取产品线 - */ - @GetMapping("getProductLines") - public ApiResult> getProductLines(@RequestParam Long id) { - AdminPermissionRoleApiMap data = permissionRoleApiMapService.lambdaQuery() - .select(AdminPermissionRoleApiMap::getProductLines) - .eq(AdminPermissionRoleApiMap::getId, id) - .one(); - if (Objects.isNull(data)) { - return ApiResult.success(Collections.emptyList()); - } - return ApiResult.success(StrUtil.split(data.getProductLines(), ",")); - } +// /** +// * 获取产品线 +// */ +// @GetMapping("getProductLines") +// public ApiResult> getProductLines(@RequestParam Long id) { +// AdminPermissionRoleApiMap data = permissionRoleApiMapService.lambdaQuery() +// .select(AdminPermissionRoleApiMap::getProductLines) +// .eq(AdminPermissionRoleApiMap::getId, id) +// .one(); +// if (Objects.isNull(data)) { +// return ApiResult.success(Collections.emptyList()); +// } +// return ApiResult.success(StrUtil.split(data.getProductLines(), ",")); +// } // /** // * 设置产品线 @@ -216,20 +216,20 @@ public class DataPermissionController extends ControllerBase { // return ApiResult.success(); // } - /** - * 获取指定的用户 - */ - @GetMapping("getUsers") - public ApiResult> getUsers(@RequestParam Long id) { - AdminPermissionRoleApiMap data = permissionRoleApiMapService.lambdaQuery() - .select(AdminPermissionRoleApiMap::getUsers) - .eq(AdminPermissionRoleApiMap::getId, id) - .one(); - if (Objects.isNull(data)) { - return ApiResult.success(Collections.emptyList()); - } - return ApiResult.success(adminUserService.getSimples(Arrays.stream(StrUtil.splitToInt(data.getUsers(), ",")).boxed().collect(Collectors.toList()))); - } +// /** +// * 获取指定的用户 +// */ +// @GetMapping("getUsers") +// public ApiResult> getUsers(@RequestParam Long id) { +// AdminPermissionRoleApiMap data = permissionRoleApiMapService.lambdaQuery() +// .select(AdminPermissionRoleApiMap::getUsers) +// .eq(AdminPermissionRoleApiMap::getRoleId, id) +// .one(); +// if (Objects.isNull(data)) { +// return ApiResult.success(Collections.emptyList()); +// } +// return ApiResult.success(adminUserService.getSimples(Arrays.stream(StrUtil.splitToInt(data.getUsers(), ",")).boxed().collect(Collectors.toList()))); +// } // // /** // * 设置指定的用户 diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/PermissionRoleApiMapVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/PermissionRoleApiMapVO.java index fe9bd0b6..5d7e99ff 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/PermissionRoleApiMapVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/PermissionRoleApiMapVO.java @@ -1,8 +1,13 @@ package com.nflg.mobilebroken.common.pojo.vo; +import cn.hutool.core.util.StrUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; @Data public class PermissionRoleApiMapVO { @@ -47,7 +52,34 @@ public class PermissionRoleApiMapVO { /** * 是否选中 */ - private Boolean selected=false; + private Boolean selected = false; + + @JsonIgnore + private String users; + + /** + * 用户id列表 + */ + private List userIds; + + public List getUserIds() { + return Arrays.stream(StrUtil.splitToInt(users, ',')).boxed().collect(Collectors.toList()); + } + + /** + * 产品线 + */ + @JsonIgnore + private String productLines; + + /** + * 产品线列表 + */ + private List productLineList; + + public List getProductLineList() { + return StrUtil.split(productLines, ','); + } // /** // * 创建人 diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminPermissionRoleApiMapMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminPermissionRoleApiMapMapper.xml index d46c941e..61492db2 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminPermissionRoleApiMapMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminPermissionRoleApiMapMapper.xml @@ -3,7 +3,7 @@