diff --git a/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/app/OtherController.java b/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/app/OtherController.java index 3bf20c1..4607c79 100644 --- a/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/app/OtherController.java +++ b/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/app/OtherController.java @@ -3,8 +3,11 @@ package cn.fw.dalaran.server.controller.app; import cn.fw.common.web.annotation.ControllerMethod; import cn.fw.common.web.auth.LoginAuthBean; import cn.fw.common.web.auth.annotation.CurrentUser; +import cn.fw.dalaran.common.constants.DalaranConstants; import cn.fw.dalaran.domain.param.LiveCheckParams; import cn.fw.dalaran.domain.vo.LiveCheckVo; +import cn.fw.dalaran.rpc.erp.UserRoleRpcService; +import cn.fw.dalaran.rpc.erp.dto.UserInfoDTO; import cn.fw.dalaran.service.Common; import cn.fw.dalaran.service.biz.OtherBizService; import cn.fw.data.base.domain.common.Message; @@ -20,6 +23,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.File; +import java.util.List; import java.util.Objects; import static cn.fw.common.web.util.ResultBuilder.success; @@ -41,6 +45,7 @@ public class OtherController { private final OtherBizService otherBizService; private final Common common; + private final UserRoleRpcService userRoleRpcService; /** * 获取直播审计页面 @@ -104,4 +109,14 @@ public class OtherController { return success(result); } + /** + * + * @param shopId 门店id + * @return + */ + @GetMapping("/test") + public Message> test(Long shopId) { + return Message.success(userRoleRpcService.getUsers(shopId, DalaranConstants.ZBSJ_ROLE_CODE)); + } + }