本地无法启动,更新代码

yun-zuoyi
wei.peng 6 years ago
parent 9169fb53e1
commit e89057e452

@ -0,0 +1,33 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.platform.bean.SysPosition;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserPosition;
import io.swagger.annotations.ApiOperation;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-24 11:16
* @Modify :
**/
public interface ICoreMemTreeService {
@ApiOperation(value = "分装岗位树",notes = "分装岗位树")
List<SysPosition> packTreeSysPosition(List<SysPosition> list,Long parentId);
@ApiOperation(value = "分装岗位树",notes = "根据用户岗位关系分装岗位树")
List<SysPosition> packTreeSysPositionBySysRefUserPosition(List<SysPosition> list, List<SysRefUserPosition> refList);
@ApiOperation(value = "分装岗位树",notes = "根据制定IDS分装岗位树")
List<SysPosition> packTreeSysPositionByIds(List<SysPosition> list, List<Long> ids);
@ApiOperation(value = "分装岗位树",notes = "根据制定ID分装岗位树")
SysPosition packTreeSysPositionById(List<SysPosition> list, Long id);
@ApiOperation(value = "查询岗位子节点",notes = "查询字节点岗位ID")
List<Long> findChildSysPosition(SysPosition position);
}

@ -25,6 +25,7 @@ public interface ICoreTreeService {
* @param parentId
* @return
*/
@Deprecated
@ApiOperation(value = "获取岗位树",notes = "根据父节点获取岗位树集合")
List<SysPosition> findSysPositionTreeByParentId(long parentId);
@ -33,6 +34,7 @@ public interface ICoreTreeService {
* @param id
* @return
*/
@Deprecated
@ApiOperation(value = "获取岗位树",notes = "根据父节点获取岗位树")
SysPosition getSysPositionTreeById(long id);
@ -41,6 +43,7 @@ public interface ICoreTreeService {
* @param parent
* @param step
*/
@Deprecated
@ApiOperation(value = "封装岗位树",notes = "封装当前岗位树")
void findSysPositionChildrenTreePack(SysPosition parent,int step);
@ -48,6 +51,7 @@ public interface ICoreTreeService {
* IDID
* @param position
*/
@Deprecated
@ApiOperation(value = "父节点检查",notes = "检查岗位的父节点是否是当前节点的子节点")
void doValidatorSysPositionParentId(SysPosition position) ;
@ -56,6 +60,7 @@ public interface ICoreTreeService {
* @param parentId
* @return
*/
@Deprecated
@ApiOperation(value = "获取部门树",notes = "根据父节点获取部门树集合")
List<SysDepartment> findSysDepartmentTreeByParentId(long parentId);
@ -64,6 +69,7 @@ public interface ICoreTreeService {
* @param id
* @return
*/
@Deprecated
@ApiOperation(value = "获取部门树",notes = "根据父节点获取部门树")
SysDepartment getSysDepartmentTreeById(long id);
@ -72,6 +78,7 @@ public interface ICoreTreeService {
* @param id ID
* @return ID
*/
@Deprecated
@ApiOperation(value = "获取部门ID集合",notes = "根据组织ID获取部门子集ID集合")
List<Long> findSysDepartmentIdByOrganizeId(long id);
@ -80,6 +87,7 @@ public interface ICoreTreeService {
* @param department
* @return ID
*/
@Deprecated
@ApiOperation(value = "获取部门ID集合",notes = "获取部门子集ID集合")
List<Long> findSysDepartmentChildIds(SysDepartment department);
@ -88,6 +96,7 @@ public interface ICoreTreeService {
* @param parent
* @param step
*/
@Deprecated
@ApiOperation(value = "封装部门树",notes = "封装当前部门树")
void findSysDepartmentChildrenTreePack(SysDepartment parent,int step);
@ -95,6 +104,7 @@ public interface ICoreTreeService {
* IDID
* @param department
*/
@Deprecated
@ApiOperation(value = "父节点检查",notes = "检查部门的父节点是否是当前节点的子节点")
void doValidatorSysDepartmentParentId(SysDepartment department) ;
@ -103,6 +113,7 @@ public interface ICoreTreeService {
* @param parentId
* @return
*/
@Deprecated
@ApiOperation(value = "获取组织树",notes = "根据父节点获取组织树集合")
List<SysOrganize> findSysOrganizeTreeByParentId(long parentId);
@ -111,6 +122,7 @@ public interface ICoreTreeService {
* @param organize
* @return ID
*/
@Deprecated
@ApiOperation(value = "获取组织子集ID集合",notes = "获取组织子集ID集合")
List<Long> findSysOrganizeChildIds(SysOrganize organize);
@ -119,6 +131,7 @@ public interface ICoreTreeService {
* @param id
* @return
*/
@Deprecated
@ApiOperation(value = "获取组织树",notes = "根据父节点获取组织树")
SysOrganize getSysOrganizeTreeById(long id);
@ -127,6 +140,7 @@ public interface ICoreTreeService {
* @param parent
* @param step
*/
@Deprecated
@ApiOperation(value = "封装组织树",notes = "封装当前组织树")
void findSysOrganizeChildrenTreePack(SysOrganize parent,int step);
@ -134,6 +148,7 @@ public interface ICoreTreeService {
* IDID
* @param organize
*/
@Deprecated
@ApiOperation(value = "父节点检查",notes = "检查组织的父节点是否是当前节点的子节点")
void doValidatorSysOrganizeParentId(SysOrganize organize) ;
@ -142,6 +157,7 @@ public interface ICoreTreeService {
* @param parentId
* @return
*/
@Deprecated
@ApiOperation(value = "获取菜单树",notes = "根据父节点获取菜单树集合")
List<SysMenu> findSysMenuTreeByParentId(long parentId);
@ -150,6 +166,7 @@ public interface ICoreTreeService {
* @param id
* @return
*/
@Deprecated
@ApiOperation(value = "获取菜单树",notes = "根据父节点获取菜单树")
SysMenu getSysMenuTreeById(long id);
@ -158,6 +175,7 @@ public interface ICoreTreeService {
* @param parent
* @param step
*/
@Deprecated
@ApiOperation(value = "封装菜单树",notes = "封装当前菜单树")
void findSysMenuChildrenTreePack(SysMenu parent, int step);
@ -167,6 +185,7 @@ public interface ICoreTreeService {
* @param roleId ID
* @param step
*/
@Deprecated
@ApiOperation(value = "封装菜单树",notes = "根据角色ID封装当前菜单树")
void findSysMenuChildrenTreeByRoleIdPack(SysMenu parent,Long roleId, int step);
@ -176,6 +195,7 @@ public interface ICoreTreeService {
* @param userId ID
* @param step
*/
@Deprecated
@ApiOperation(value = "封装菜单树",notes = "根据用户ID封装当前菜单树")
void findSysMenuChildrenTreeByUserIdPack(SysMenu parent,Long userId, int step);
@ -185,6 +205,7 @@ public interface ICoreTreeService {
* @param cacheMenuList
* @param step
*/
@Deprecated
@ApiOperation(value = "封装菜单树",notes = "根据用户ID 内存中封装当前菜单树")
void findMemSysMenuChildrenTreeByUserIdPack(SysMenu parent, List<SysMenu> cacheMenuList, int step);
@ -192,6 +213,7 @@ public interface ICoreTreeService {
* IDID
* @param menu
*/
@Deprecated
@ApiOperation(value = "父节点检查",notes = "检查菜单的父节点是否是当前节点的子节点")
void doValidatorSysMenuParentId(SysMenu menu) ;
@ -200,6 +222,7 @@ public interface ICoreTreeService {
* @param parentId
* @return
*/
@Deprecated
@ApiOperation(value = "获取组织部门树",notes = "根据父节点获取组织部门树集合")
List<CommonTreeModel> findOrganizeDepartment(long parentId);
@ -208,6 +231,7 @@ public interface ICoreTreeService {
* @param id
* @return
*/
@Deprecated
@ApiOperation(value = "获取组织部门树",notes = "根据父节点获取组织部门树")
CommonTreeModel getOrganizeById(long id);
@ -216,6 +240,7 @@ public interface ICoreTreeService {
* @param parent
* @param step
*/
@Deprecated
@ApiOperation(value = "封装菜单树",notes = "封装当前组织部门树")
void findOrganizeTreePack(CommonTreeModel parent, int step);

@ -51,9 +51,12 @@ public interface ISysPositionService {
*
* @return
*/
@ApiOperation(value = "新增岗位信息")
@ApiOperation(value = "查询所有岗位信息")
List listSysPosition();
@ApiOperation(value = "根据组织代码获取岗位列表")
List findSysPositionByOrganizeCode(String organizeCode);
/**
*
* @param position

@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.persistence.EntityManager;
import java.io.BufferedWriter;

@ -206,6 +206,7 @@ public class PersonnelController extends CoreBaseController {
userInfo.setUserPoliticalStatus(info.getUserPoliticalStatus());
userInfo.setUserGrade(info.getUserGrade());
userInfo.setUserEmployeeType(info.getUserEmployeeType());
userInfo.setUserImageId(info.getUserImageId());
sysUser.setUserLoginName(user.getUserLoginName());
sysUser.setLanguageCode(user.getLanguageCode());

@ -0,0 +1,135 @@
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.ISysPositionService;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
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.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 2019-07-04 12:52
* @Modify:
**/
@RestController
@Api(description = "内存树服务")
@RequestMapping(PlatformConstWords.BASE_URL + "/mem-tree")
public class SysMemTreeController {
@Autowired
private ISysPositionService positionService;
@Autowired
private ICoreMemTreeService memTreeService;
@Autowired
private SysRefUserPositionRepository refUserPositionRDao;
/**
* -1
* @return
*/
@GetMapping(value="/position/root")
@ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树,-1为根节点")
public ResultBean listSysPositionTree() {
try {
List list = positionService.listSysPosition();
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(memTreeService.packTreeSysPosition(list,CommonEnumUtil.PARENT.DEFAULT.getValue()));
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@GetMapping(value="/position/userId")
@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);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(memTreeService.packTreeSysPositionBySysRefUserPosition(listTree,refList));
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@GetMapping(value="/position/ids")
@ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树,-1为根节点")
public ResultBean listSysPositionParentId(Long[] ids) {
try {
List list = positionService.listSysPosition();
List listTree = memTreeService.packTreeSysPosition(list, CommonEnumUtil.PARENT.DEFAULT.getValue());
List dataListTree = memTreeService.packTreeSysPositionByIds(listTree, Arrays.asList(ids));
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(dataListTree);
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@GetMapping(value="/position/id")
@ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树,-1为根节点")
public ResultBean listSysPositionById(Long id) {
try {
List list = positionService.listSysPosition();
SysPosition position = memTreeService.packTreeSysPositionById(list,id);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(position);
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@GetMapping(value="/position/child")
@ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树,-1为根节点")
public ResultBean listSysPositionChild(Long id) {
try {
List list = positionService.listSysPosition();
SysPosition position = memTreeService.packTreeSysPositionById(list,id);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(memTreeService.findChildSysPosition(position));
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
}

@ -0,0 +1,102 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService;
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysPosition;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserPosition;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 2019-07-04 12:46
* @Modify:
**/
@Service
public class CoreMemTreeService implements ICoreMemTreeService {
@Override
public List<SysPosition> packTreeSysPosition(List<SysPosition> list, Long parentId) {
List<SysPosition> result = new ArrayList<>();
List<SysPosition> copyList = new ArrayList<>(list);
if(list != null && list.size() > 0){
list.forEach(position -> {
if(position.getParentId() != null && position.getParentId().equals(parentId)){
result.add(position);
copyList.remove(position);
position.setChildList(packTreeSysPosition(copyList, position.getId()));
}
});
}
return result;
}
@Override
public List<SysPosition> packTreeSysPositionBySysRefUserPosition(List<SysPosition> list, List<SysRefUserPosition> refList) {
List<Long> ids = new ArrayList<>(refList.size());
if(refList != null && refList.size() > 0){
refList.forEach(ref ->{
ids.add(ref.getPositionId());
});
}
return packTreeSysPositionByIds(list, ids);
}
@Override
public List<SysPosition> packTreeSysPositionByIds(List<SysPosition> list, List<Long> ids) {
List<SysPosition> result = new ArrayList<>();
if(list != null && list.size() > 0){
list.forEach(position -> {
if(position.getChildList() == null || position.getChildList().size() <= 0){
if(ids.contains(position.getId())){
result.add(position);
}
}else{
List<SysPosition> childList = packTreeSysPositionByIds(position.getChildList(), ids);
if(ids.contains(position.getId()) || childList != null && childList.size() > 0){
result.add(position);
}
}
});
}
return result;
}
@Override
public SysPosition packTreeSysPositionById(List<SysPosition> list, Long id) {
if(list != null && list.size() > 0){
for (SysPosition position : list) {
if(position.getId().equals(id)){
position.setChildList(packTreeSysPosition(list, position.getId()));
return position;
}
}
}
return null;
}
@Override
public List<Long> findChildSysPosition(SysPosition position) {
List<Long> result = new ArrayList<>();
if(position != null && position.getChildList() != null && position.getChildList().size() > 0){
for (SysPosition sp : position.getChildList()) {
result.add(sp.getId());
result.addAll(findChildSysPosition(sp));
}
}
return result;
}
}

@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
@ -145,6 +146,13 @@ public class SysPositionService implements ISysPositionService {
}
@Override
public List findSysPositionByOrganizeCode(String organizeCode) {
LOGGER.info("岗位信息 SysPosition By OrganizeCode:{}",organizeCode);
return null;
}
@Override
@ApiOperation(value = "查询岗位信息", notes = "查询岗位信息 (分页,组合)")
public ListPager<SysPosition> querySysPosition(SysPosition position, Pager pager) {
LOGGER.info("岗位信息 SysPosition find SysPosition page");
@ -156,9 +164,9 @@ public class SysPositionService implements ISysPositionService {
return new ListPager(positionRDao.listPager(pager), pager);
} else {
//生成hql查询语句
String hqlPack = CoreHqlPack.packHqlSysPosition(position);
pager = PagerHelper.getPager(pager, positionRDao.findByHqlWhereCount(hqlPack));
return new ListPager(positionRDao.findByHqlWherePage(hqlPack + position.orderBy(), pager), pager);
DdlPackBean ddlPackBean = CoreHqlPack.packHqlSysPosition(position);
pager = PagerHelper.getPager(pager, positionRDao.findByHqlWhereCount(ddlPackBean));
return new ListPager(positionRDao.findByHqlWherePage(ddlPackBean, pager), pager);
}
}
@ -179,11 +187,13 @@ public class SysPositionService implements ISysPositionService {
pager = PagerHelper.getPager(pager, positionRDao.listCount());
return new ListPager(positionRDao.listPager(pager), pager);
} else {
String hqlPack = CoreHqlPack.packHqlSysPosition(position);
pager = PagerHelper.getPager(pager, positionRDao.findByHqlWhereCount(hqlPack));
return new ListPager(positionRDao.findByHqlWherePage(hqlPack + position.orderBy(), pager), pager);
DdlPackBean ddlPackBean = CoreHqlPack.packHqlSysPosition(position);
pager = PagerHelper.getPager(pager, positionRDao.findByHqlWhereCount(ddlPackBean));
return new ListPager(positionRDao.findByHqlWherePage(ddlPackBean, pager), pager);
}
}
}

Loading…
Cancel
Save