From b47d4a7accabce974e19d2a1ffb3c5c67507d74b Mon Sep 17 00:00:00 2001 From: wangwh <2397901735@qq.com> Date: Wed, 28 Aug 2024 15:11:59 +0800 Subject: [PATCH] 1、组织架构的接口 2、事项登记接口 --- dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoleWebController.java | 48 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 16 deletions(-) diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoleWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoleWebController.java index 0ea90ef..f28d86a 100644 --- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoleWebController.java +++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctrole/controller/web/CtRoleWebController.java @@ -2,11 +2,18 @@ import cn.huge.base.common.utils.ReturnFailUtils; import cn.huge.base.common.utils.ReturnSucUtils; +import cn.huge.base.config.CurrentUser; +import cn.huge.module.ctrole.domain.bo.CtRoleBO; import cn.huge.module.ctrole.domain.po.CtRole; import cn.huge.module.ctrole.service.CtRoleService; +import cn.huge.module.ctrole.service.CtRolefunService; +import cn.huge.module.ctuser.domain.bo.RoleTreeBO; +import cn.huge.module.ctuser.service.CtUserService; +import cn.huge.module.cust.dto.CtUserDTO; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -14,6 +21,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.List; import java.util.Map; /** @@ -26,7 +34,7 @@ */ @Slf4j @RestController -@RequestMapping("/api/web/cRole") +@RequestMapping("/api/web/ctRole") public class CtRoleWebController { @Autowired(required = false) @@ -34,6 +42,12 @@ @Autowired private CtRoleService service; + + @Autowired + private CtUserService ctUserService; + + @Autowired + private CtRolefunService ctRolefunService; /** * 获取请求URL参数 @@ -129,21 +143,6 @@ } /** - * 根据编号查询单个 - * @url {ctx}/api/web/cRole/getById - * @param id 主键编号 - * @return Object - */ - @GetMapping("/getById") - public Object getById(@RequestParam(value = "id") String id) { - try { - return ReturnSucUtils.getRepInfo(service.getById(id)); - } catch (Exception e) { - return ReturnFailUtils.getRepInfo(); - } - } - - /** * 根据主键单个 * @url {ctx}/api/web/cRole/deleteById * @param id 主键编号 @@ -175,4 +174,21 @@ } } + /** + * 根据编号查询单个角色下属权限 + * @url {ctx}/api/web/ctRole/getById + * @param id 主键编号 + * @return Object + * @throws Exception + */ + @GetMapping("/getById") + public Object getById(@RequestParam(value = "id") String id, @CurrentUser String userId) { + try { + CtRoleBO bo = service.webGetById(id, userId); + return ReturnSucUtils.getRepInfo(bo); + } catch (Exception e) { + return ReturnFailUtils.getRepInfo(); + } + } + } -- Gitblit v1.8.0