From 816a0687e3f8798175bb039c86fd61d1cf9bec0b Mon Sep 17 00:00:00 2001 From: nies Date: Fri, 19 Nov 2021 10:09:17 +0800 Subject: [PATCH] =?UTF-8?q?(update)=E5=A2=9E=E5=8A=A0=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=99=BB=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=9A=84=E6=8E=A5=E5=8F=A3queryAllRoleRefUse?= =?UTF-8?q?r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/WhiteController.java | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index e74245c..677c469 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -18,8 +18,10 @@ import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.annotation.AnnoIgnoreLog; import cn.estsh.i3plus.pojo.base.bean.BaseConstWords; +import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; import cn.estsh.i3plus.pojo.base.bean.BaseThreadLocal; import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -27,6 +29,7 @@ import cn.estsh.i3plus.pojo.model.common.CloudPagerModel; import cn.estsh.i3plus.pojo.model.common.ImppSmsContent; import cn.estsh.i3plus.pojo.model.license.ImppLicense; import cn.estsh.i3plus.pojo.model.platform.SysLoginModel; +import cn.estsh.i3plus.pojo.model.platform.SysRoleModel; import cn.estsh.i3plus.pojo.model.platform.UserDetailModel; import cn.estsh.i3plus.pojo.model.platform.UserDetailPagerModel; import cn.estsh.i3plus.pojo.platform.bean.*; @@ -60,6 +63,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -162,6 +166,9 @@ public class WhiteController extends CoreBaseController { @Autowired private SysSmsSendRecordController smsSendRecordController; + @Autowired + private ISysRoleService sysRoleService; + private Cache unsavedLocaleResSwitch = CacheBuilder.newBuilder() .maximumSize(1) .expireAfterWrite(1, TimeUnit.MINUTES) @@ -910,4 +917,36 @@ public class WhiteController extends CoreBaseController { public ResultBean sendSms(@RequestBody ImppSmsContent imppSmsContent){ return smsSendRecordController.send(imppSmsContent); } + + + @PostMapping(value = "/queryAllRoleRefUser") + @ApiOperation(value = "在所有角色中查询角色及关联的人员信息", notes = "查询角色及关联的人员信息") + public BaseResultBean queryAllRoleRefUser(@RequestBody SysRoleModel sysRoleModel) { + try { + ListPager result = null; + List roleList = null; + SysRole sysRole = sysRoleModel.getSysRole(); + Pager pager = sysRoleModel.getPager(); + if (ObjectUtils.isEmpty(sysRole)) { + sysRole = new SysRole(); + } + if (ObjectUtils.isEmpty(pager)) { + pager = new Pager(); + } + //过滤SysRefUserRole + roleList = sysRoleService.findAllByRoleProperty(sysRole); + if (ObjectUtils.isEmpty(roleList)){ + return ResultBean.success("操作成功"); + } + + List roleIdList = roleList.stream().map(el -> el.getId()).collect(Collectors.toList()); + result = personnelService.findSysRefUserRoleByRoleIds(roleIdList, pager); + return ResultBean.success("操作成功").setListPager(result).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + }