From a6215893e134299e752f8460b080f9efa23a6b6a Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Mon, 26 Sep 2022 18:38:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.5=E3=80=91=E3=80=90user=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=8E=B7=E5=8F=96=E9=80=89=E6=8B=A9=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/constants/SystemConstants.java | 5 ++++ .../controller/SysUserGroupController.java | 13 ++++++++++ .../user/service/SysUserGroupService.java | 25 +++++++++++++------ .../service/impl/SysUserGroupServiceImpl.java | 11 ++++++++ 4 files changed, 46 insertions(+), 8 deletions(-) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java index 299cae78a..916a8d72e 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java @@ -92,4 +92,9 @@ public interface SystemConstants { */ String APPROVER_TYPE_DICT_TYPE_CODE = "org_approver_type"; + /** + * 用户组，获取关系列表的字典编码 + */ + String SELECT_TYPE_DICT_TYPE_CODE = "select_relation"; + } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java index 51d3a83a5..36f6cb49a 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.system.modular.user.controller; +import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * 用户组控制器 @@ -50,4 +52,15 @@ public class SysUserGroupController { return new SuccessResponseData<>(sysUserGroupService.detail(sysUserGroupRequest)); } + /** + * 获取用户组-选择关系列表 + * + * @author fengshuonan + * @date 2022/09/26 10:12 + */ + @GetResource(name = "获取用户组-选择关系列表", path = "/sysUserGroup/getSelectRelationList") + public ResponseData> getSelectRelationList() { + return new SuccessResponseData<>(sysUserGroupService.getSelectRelationList()); + } + } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java index 1f8fc9e25..8b9595935 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java @@ -1,6 +1,7 @@ package cn.stylefeng.roses.kernel.system.modular.user.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserGroup; import cn.stylefeng.roses.kernel.system.modular.user.pojo.request.SysUserGroupRequest; import com.baomidou.mybatisplus.extension.service.IService; @@ -15,7 +16,7 @@ import java.util.List; */ public interface SysUserGroupService extends IService { - /** + /** * 新增 * * @param sysUserGroupRequest 请求参数 @@ -24,7 +25,7 @@ public interface SysUserGroupService extends IService { */ SysUserGroup add(SysUserGroupRequest sysUserGroupRequest); - /** + /** * 删除 * * @param sysUserGroupRequest 请求参数 @@ -33,7 +34,7 @@ public interface SysUserGroupService extends IService { */ void del(SysUserGroupRequest sysUserGroupRequest); - /** + /** * 编辑 * * @param sysUserGroupRequest 请求参数 @@ -42,7 +43,7 @@ public interface SysUserGroupService extends IService { */ void edit(SysUserGroupRequest sysUserGroupRequest); - /** + /** * 查询详情 * * @param sysUserGroupRequest 请求参数 @@ -51,24 +52,32 @@ public interface SysUserGroupService extends IService { */ SysUserGroup detail(SysUserGroupRequest sysUserGroupRequest); - /** + /** * 获取列表 * - * @param sysUserGroupRequest 请求参数 + * @param sysUserGroupRequest 请求参数 * @return List 返回结果 * @author fengshuonan * @date 2022/09/26 10:12 */ List findList(SysUserGroupRequest sysUserGroupRequest); - /** + /** * 获取列表（带分页） * - * @param sysUserGroupRequest 请求参数 + * @param sysUserGroupRequest 请求参数 * @return PageResult 返回结果 * @author fengshuonan * @date 2022/09/26 10:12 */ PageResult findPage(SysUserGroupRequest sysUserGroupRequest); + /** + * 获取选择关系列表 + * + * @author fengshuonan + * @date 2022/9/26 17:30 + */ + List getSelectRelationList(); + } \ No newline at end of file diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupServiceImpl.java index 6f6f70b18..37edb5d37 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupServiceImpl.java @@ -5,7 +5,10 @@ import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.dict.api.DictApi; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; +import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserGroup; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserGroupDetail; import cn.stylefeng.roses.kernel.system.modular.user.enums.SysUserGroupExceptionEnum; @@ -35,6 +38,9 @@ public class SysUserGroupServiceImpl extends ServiceImpl getSelectRelationList() { + return dictApi.getDictDetailsByDictTypeCode(SystemConstants.SELECT_TYPE_DICT_TYPE_CODE); + } + @Override public List findList(SysUserGroupRequest sysUserGroupRequest) { LambdaQueryWrapper wrapper = this.createWrapper(sysUserGroupRequest);