I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

树DEMO 功能完成

Browse Source
yun-zuoyi
wei.peng 6 years ago
parent 540b1faca0
commit aaf76a00dc
5 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File

29
modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java
Unescape Escape View File

@ -15,18 +15,47 @@ import java.util.List;
**/
public interface ICoreMemTreeService {
/**
* List 分装成树数据
* @param list 原始List
* @param parentId 父节点ID
* @return 多棵树
*/
@ApiOperation(value = "分装岗位树",notes = "分装岗位树")
List<SysPosition> packTreeSysPosition(List<SysPosition> list,Long parentId);
/**
* 根据用户岗位关系 修剪树的数据
* @param list 分装好的树
* @param refList 需要保留的书关系
* @return 修剪后的树
*/
@ApiOperation(value = "分装岗位树",notes = "根据用户岗位关系分装岗位树")
List<SysPosition> packTreeSysPositionBySysRefUserPosition(List<SysPosition> list, List<SysRefUserPosition> refList);
/**
* 根据岗位ID 修剪树的数据
* @param list 分装好的树
* @param ids 需要保留的书关系
* @return 修剪后的树
*/
@ApiOperation(value = "分装岗位树",notes = "根据制定IDS分装岗位树")
List<SysPosition> packTreeSysPositionByIds(List<SysPosition> list, List<Long> ids);
/**
* 根据岗位对象分装书数据
* @param list
* @param id
* @return
*/
@ApiOperation(value = "分装岗位树",notes = "根据制定ID分装岗位树")
SysPosition packTreeSysPositionById(List<SysPosition> list, Long id);
/**
* 获取制定树的所有叶子节点ID
* @param position
* @return
*/
@ApiOperation(value = "查询岗位子节点",notes = "查询字节点岗位ID")
List<Long> findChildSysPosition(SysPosition position);

2
modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java
Unescape Escape View File

@ -55,7 +55,7 @@ public interface ISysPositionService {
List listSysPosition();
@ApiOperation(value = "根据组织代码获取岗位列表")
List findSysPositionByOrganizeCode(String organizeCode);
List findSysPositionList(SysPosition position);
/**
* 复杂查询

16
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java
Unescape Escape View File

@ -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<SysRefUserPosition> refList = refUserPositionRDao.findByProperty("userId", userId);
List<SysRefUserPosition> 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){

10
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java
Unescape Escape View File

@ -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<SysPosition> 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<SysPosition> listPager = positionService.querySysPosition(position, pager);
return ResultBean.success("操作成功").setListPager(listPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());

7
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java
Unescape Escape View File

@ -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

Write Preview
Loading…
Cancel
Save