From aaf76a00dcc2ad3cebb5ec25cd846ea699acf423 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 4 Jul 2019 16:24:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=91DEMO=20=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/busi/ICoreMemTreeService.java | 29 ++++++++++++++++++++++ .../api/iservice/busi/ISysPositionService.java | 2 +- .../controller/busi/SysMemTreeController.java | 16 +++++++----- .../controller/busi/SysPositionController.java | 10 ++++---- .../serviceimpl/busi/SysPositionService.java | 7 +++--- 5 files changed, 48 insertions(+), 16 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java index 65164b5..662ff68 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java @@ -15,18 +15,47 @@ import java.util.List; **/ public interface ICoreMemTreeService { + /** + * List 分装成树数据 + * @param list 原始List + * @param parentId 父节点ID + * @return 多棵树 + */ @ApiOperation(value = "分装岗位树",notes = "分装岗位树") List packTreeSysPosition(List list,Long parentId); + /** + * 根据用户岗位关系 修剪树的数据 + * @param list 分装好的树 + * @param refList 需要保留的书关系 + * @return 修剪后的树 + */ @ApiOperation(value = "分装岗位树",notes = "根据用户岗位关系分装岗位树") List packTreeSysPositionBySysRefUserPosition(List list, List refList); + /** + * 根据岗位ID 修剪树的数据 + * @param list 分装好的树 + * @param ids 需要保留的书关系 + * @return 修剪后的树 + */ @ApiOperation(value = "分装岗位树",notes = "根据制定IDS分装岗位树") List packTreeSysPositionByIds(List list, List ids); + /** + * 根据岗位对象分装书数据 + * @param list + * @param id + * @return + */ @ApiOperation(value = "分装岗位树",notes = "根据制定ID分装岗位树") SysPosition packTreeSysPositionById(List list, Long id); + /** + * 获取制定树的所有叶子节点ID + * @param position + * @return + */ @ApiOperation(value = "查询岗位子节点",notes = "查询字节点岗位ID") List findChildSysPosition(SysPosition position); diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java index be2a398..18d232b 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java @@ -55,7 +55,7 @@ public interface ISysPositionService { List listSysPosition(); @ApiOperation(value = "根据组织代码获取岗位列表") - List findSysPositionByOrganizeCode(String organizeCode); + List findSysPositionList(SysPosition position); /** * 复杂查询 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java index 03421f6..2c05c45 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService; +import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService; import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -8,6 +9,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysPosition; import cn.estsh.i3plus.pojo.platform.bean.SysRefUserPosition; import cn.estsh.i3plus.pojo.platform.repository.SysRefUserPositionRepository; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ResultBean; @@ -32,7 +34,7 @@ import java.util.List; @RestController @Api(description = "内存树服务") @RequestMapping(PlatformConstWords.BASE_URL + "/mem-tree") -public class SysMemTreeController { +public class SysMemTreeController extends CoreBaseController { @Autowired private ISysPositionService positionService; @@ -41,7 +43,7 @@ public class SysMemTreeController { private ICoreMemTreeService memTreeService; @Autowired - private SysRefUserPositionRepository refUserPositionRDao; + private IPersonnelService personnelService; /** * 根据父节点ID 获取树列表 @@ -52,10 +54,11 @@ public class SysMemTreeController { public ResultBean listSysPositionTree() { try { List list = positionService.listSysPosition(); + List treeList = memTreeService.packTreeSysPosition(list, CommonEnumUtil.PARENT.DEFAULT.getValue()); return ResultBean.success("查询部门树成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultList(memTreeService.packTreeSysPosition(list,CommonEnumUtil.PARENT.DEFAULT.getValue())); + .setResultList(treeList); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -68,17 +71,18 @@ public class SysMemTreeController { * @param userId * @return */ - @GetMapping(value="/position/userId") + @GetMapping(value="/position/user") @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树，-1为根节点") public ResultBean listSysPositionParentId(Long userId) { try { List list = positionService.listSysPosition(); List listTree = memTreeService.packTreeSysPosition(list, CommonEnumUtil.PARENT.DEFAULT.getValue()); - List refList = refUserPositionRDao.findByProperty("userId", userId); + List refList = personnelService.findSysRefUserPositionById(getSessionUser().getUserInfo().getId()); + List userTreeList = memTreeService.packTreeSysPositionBySysRefUserPosition(listTree, refList); return ResultBean.success("查询部门树成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultList(memTreeService.packTreeSysPositionBySysRefUserPosition(listTree,refList)); + .setResultList(userTreeList); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java index a1fafac..493a310 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java @@ -113,16 +113,15 @@ public class SysPositionController extends CoreBaseController { /** * 查询所有岗位 - * * @return 处理结果 */ @GetMapping(value = "/list") @ApiOperation(value = "查询所有岗位", notes = "查询所有岗位") - public ResultBean findSysPositionAll() { + public ResultBean findSysPositionAll(SysPosition position) { try { - List positionList = positionService.listSysPosition(); - return ResultBean.success("操作成功").setResultList(positionList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + position.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + return ResultBean.success("操作成功").setResultList(positionService.findSysPositionList(position)) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -140,6 +139,7 @@ public class SysPositionController extends CoreBaseController { @ApiOperation(value = "查询岗位", notes = "复杂查询岗位带分页") public ResultBean querySysPosition(SysPosition position, Pager pager) { try { + position.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); ListPager listPager = positionService.querySysPosition(position, pager); return ResultBean.success("操作成功").setListPager(listPager) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java index 6ddba5e..9226218 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java @@ -146,10 +146,9 @@ public class SysPositionService implements ISysPositionService { } @Override - public List findSysPositionByOrganizeCode(String organizeCode) { - LOGGER.info("岗位信息 SysPosition By OrganizeCode:{}",organizeCode); - - return null; + public List findSysPositionList(SysPosition position) { + LOGGER.info("岗位信息 SysPosition By position:{}",position); + return positionRDao.findByHqlWhere(CoreHqlPack.packHqlSysPositionList(position)); } @Override