diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IDepartmentService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IDepartmentService.java index 5806941..6ea79f8 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IDepartmentService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IDepartmentService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.Department; +import cn.estsh.i3plus.pojo.platform.bean.Organize; import java.util.List; @@ -19,7 +20,7 @@ public interface IDepartmentService { * 添加部门 * @param department */ - void insertDepartment(Department department); + Department insertDepartment(Department department); /** * 根据id删除部门 @@ -47,6 +48,14 @@ public interface IDepartmentService { List listDepartment(); /** + * 复杂查询 + * @param department + * @param pager + * @return + */ + ListPager queryDepartment(Department department, Pager pager); + + /** * 根据id查询部门 * @param id * @return diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IOrganizeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IOrganizeService.java index d72ea11..c82b169 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IOrganizeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IOrganizeService.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.core.api.iservice.busi; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.Organize; +import cn.estsh.i3plus.pojo.platform.bean.Position; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import org.springframework.transaction.annotation.Transactional; @@ -53,7 +56,15 @@ public interface IOrganizeService { * 查询所有数据 * @return */ - List findOrganizeAll(); + List listOrganize(); + + /** + * 复杂查询 + * @param organize + * @param pager + * @return + */ + ListPager queryOrganize(Organize organize, Pager pager); /** * 根据id 数据 diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPositionService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPositionService.java index a486ba7..c62e46e 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPositionService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPositionService.java @@ -53,7 +53,7 @@ public interface IPositionService { List listPosition(); /** - * 负责查询 + * 复杂查询 * @param position * @param pager * @return diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java index d05d194..2337d42 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.core.api.iservice.busi; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.Department; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; @@ -69,6 +72,14 @@ public interface ISysMenuService { */ SysMenu getSysMenuById(String id); + /** + * 复杂查询 + * @param menu + * @param pager + * @return + */ + ListPager querySysMenu(SysMenu menu, Pager pager); + } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java index 73fe09d..d65af2b 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.core.api.iservice.busi; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; +import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.bean.SysRole; import org.springframework.transaction.annotation.Transactional; @@ -59,4 +62,12 @@ public interface ISysRoleService { * @return */ SysRole getSysRoleById(String id); + + /** + * 复杂查询 + * @param role + * @param pager + * @return + */ + ListPager querySysRole(SysRole role, Pager pager); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index a155880..cad395c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.core.apiservice.controller.DemoAuthController; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.Department; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; @@ -59,7 +60,8 @@ public class AuthController { AuthUtil.setSessionObject("languageCode",languageCode); String sessionId = request.getSession().getId(); String token = "{accessToken:'"+sessionId+"',expiresIn:1800}"; - return new ResultBean(true,token,AuthUtil.getSessionUser()); + SysUser sysUser = AuthUtil.getSessionUser().getUser(); + return new ResultBean(true,token,sysUser); } catch (ImppBusiException e) { return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution()); }catch (Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java index 1bd541b..daaae43 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java @@ -55,6 +55,9 @@ public class DepartmentController { //新增初始化 ConvertBean.modelInitialize(department, user); + if(department.getParentId() == null || department.getParentId().intValue() == 0){ + department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + } departmentService.insertDepartment(department); return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -81,8 +84,10 @@ public class DepartmentController { .notNull("departmentCode", department.getDepartmentCode()) .checkNotZero("organizeId",department.getOrganizeId()); - //修改初始化 ConvertBean.modelUpdate(department, user); + if(department.getParentId() == null || department.getParentId().intValue() == 0){ + department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + } departmentService.updateDepartment(department); return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -133,14 +138,15 @@ public class DepartmentController { @ApiOperation(value = "根据id查询部门", notes = "根据id查询部门") public ResultBean getDepartmentById(@PathVariable("id") String id) { try { - // todo NULL判断 + ValidatorBean.checkNotNull(id, "角色id 不能为空"); + Department department = departmentService.getDepartmentById(id); - if (department != null) { - return ResultBean.success("查询成功") - .setResultObject(department).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }else { - return ResultBean.fail("部门不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); - } + + ValidatorBean.beginValid(department); + + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(department); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); return ResultBean.fail(busExcep.getErrorShow()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java index 94f4d1b..5d15fda 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +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.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.Organize; @@ -49,6 +51,9 @@ public class OrganizeController { //新增初始化 ConvertBean.modelInitialize(organize, AuthUtil.getSessionUser()); + if(organize.getParentId() == null || organize.getParentId().intValue() == 0){ + organize.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + } organize = organizeService.insertOrganize(organize); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(organize); @@ -71,6 +76,9 @@ public class OrganizeController { .notNull("organizeTypeId", organize.getOrganizeTypeId()); ConvertBean.modelUpdate(organize, AuthUtil.getSessionUser()); + if(organize.getParentId() == null || organize.getParentId().intValue() == 0){ + organize.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + } organizeService.updateOrganize(organize); return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -104,7 +112,7 @@ public class OrganizeController { @ApiOperation(value = "查询Organize", notes = "查询所有组织") public ResultBean findOrganizeAll() { try { - List list = organizeService.findOrganizeAll(); + List list = organizeService.listOrganize(); return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultList(list); @@ -117,6 +125,22 @@ public class OrganizeController { } } + @GetMapping(value="/query") + @ApiOperation(value="查询所有组织",notes="查询所有组织") + public ResultBean queryPosition(Organize organize, Pager pager){ + try{ + ListPager listPager = organizeService.queryOrganize(organize, pager); + return ResultBean.success("操作成功").setListPager(listPager) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + @GetMapping(value = "/get/{id}") @ApiOperation(value = "查询组织", notes = "查询根据ID查询组织") public ResultBean getByOrganizeId(@PathVariable("id") String id) { @@ -162,12 +186,14 @@ public class OrganizeController { public ResultBean deleteOrganizeByIds(String[] ids){ try{ if(ids.length == 0){ + throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorDetail("请选择需要删除的资源。") .build(); } + organizeService.deleteOrganizeByIds(ids); return ResultBean.success("删除成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java index 2295e0d..bfe2454 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java @@ -82,6 +82,9 @@ public class PositionController { //修改初始化 ConvertBean.modelUpdate(position,user); + if(position.getParentId() == null || position.getParentId().intValue() == 0){ + position.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + } positionService.updatePosition(position); return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -148,7 +151,12 @@ public class PositionController { @ApiOperation(value="根据id查询岗位",notes="根据id查询岗位") public ResultBean getPositionById(@PathVariable("id") String id){ try{ + ValidatorBean.checkNotNull(id, "id 不能为空"); + Position position = positionService.getPositionById(id); + ValidatorBean.beginValid(position) + .notNull("id",position.getId()); + return ResultBean.success("查询成功") .setResultObject(position) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index 58e3419..4c02db7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -2,7 +2,10 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; + import cn.estsh.i3plus.pojo.base.bean.ListPager; + import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; + import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -114,6 +117,23 @@ public class SysMenuController { } } + @GetMapping(value="/query") + @ApiOperation(value="查询所有权限",notes="查询所有权限") + public ResultBean queryPosition(SysMenu menu, Pager pager){ + try{ + ListPager listPager = sysMenuService.querySysMenu(menu, pager); + return ResultBean.success("操作成功").setListPager(listPager) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @GetMapping(value = "/get/{id}") @ApiOperation(value = "查询系统功能", notes = "查询根据ID查询系统功能") public ResultBean getById(@PathVariable("id") String id) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TreeController.java index af2abd0..ee477d3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TreeController.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; +import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.Department; +import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.bean.Position; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; @@ -20,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * @Description : + * @Description : 系统树服务 * @Reference : * @Author : wei.peng * @Date : 2018-10-29 14:56 @@ -36,8 +38,11 @@ public class TreeController { @Autowired private ICoreTreeService coreTreeService; + @Autowired + private IOrganizeService organizeService; + @GetMapping(value="/position/get/{id}") - @ApiOperation(value="查询部门树",notes="通过部门主键获取部门树，-1为根节点") + @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树，-1为根节点") public ResultBean listPositionTree(@PathVariable("id") long id) { try { Position position = coreTreeService.getPositionTreeByParentId(id); @@ -56,7 +61,7 @@ public class TreeController { @GetMapping(value="/position/list/{parentId}") - @ApiOperation(value="查询部门树",notes="通过部门主键获取部门树，-1为根节点") + @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树，-1为根节点") public ResultBean listPositionListTree(@PathVariable("parentId") long parentId) { try { List positionList = coreTreeService.findPositionTreeByParentId(parentId); @@ -73,5 +78,76 @@ public class TreeController { } } + @GetMapping(value="/organize/get/{id}") + @ApiOperation(value="查询组织树",notes="通过部门主键获取组织树，-1为根节点") + public ResultBean listOrganizeTree(@PathVariable("id") long id) { + try { + Organize obj = coreTreeService.getOrganizeTreeByParentId(id); + + return ResultBean.success("查询部门树成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(obj); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @GetMapping(value="/organize/list/{parentId}") + @ApiOperation(value="查询组织树",notes="通过部门主键获取组织树，-1为根节点") + public ResultBean listOrganizeListTree(@PathVariable("parentId") long parentId) { + try { + List resultList = coreTreeService.findOrganizeTreeByParentId(parentId); + + return ResultBean.success("查询部门树成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(resultList); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @GetMapping(value="/department/get/{id}") + @ApiOperation(value="部门树",notes="通过部门主键获取部门树，-1为根节点") + public ResultBean listDepartmentTree(@PathVariable("id") long id) { + try { + Department obj = coreTreeService.getDepartmentTreeByParentId(id); + + return ResultBean.success("查询部门树成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(obj); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + + @GetMapping(value="/department/list/{parentId}") + @ApiOperation(value="查询组织树",notes="通过部门主键获取组织树，-1为根节点") + public ResultBean listDepartmentListTree(@PathVariable("parentId") long parentId) { + try { + List resultList = coreTreeService.findDepartmentTreeByParentId(parentId); + return ResultBean.success("查询部门树成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(resultList); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java index a193a20..217c145 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java @@ -22,6 +22,7 @@ import java.util.List; * @Date : 2018-10-24 11:17 * @Modify : **/ +//TODO for -> 传统for @Service public class CoreTreeServiceImpl implements ICoreTreeService { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java index 16c7716..7689861 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java @@ -38,9 +38,9 @@ public class DepartmentServiceImpl implements IDepartmentService { private OrganizeRepository organizeRDao; @Override - public void insertDepartment(Department department) { + public Department insertDepartment(Department department) { // 查询父级部门名称 - if (department.getParentId() != null && department.getParentId() > 0) { + if (department.getParentId() != null && department.getParentId().intValue() > 0) { LOGGER.info("部门信息 DEPARTMENT :{}", department.getParentId()); Department parentPosition = departmentRDao.getById(department.getParentId()); ValidatorBean.checkNotNull(parentPosition); @@ -57,7 +57,7 @@ public class DepartmentServiceImpl implements IDepartmentService { // 新增部门 LOGGER.info("部门信息 DEPARTMENT {}",department); - departmentRDao.insert(department); + return departmentRDao.insert(department); } @Override @@ -89,7 +89,7 @@ public class DepartmentServiceImpl implements IDepartmentService { .setErrorSolution("请重新操作") .build(); }else { - Long[] array = new Long[ids.length]; + long[] array = new long[ids.length]; for (int i = 0; i < ids.length; i++) { array[i] = Long.parseLong(ids[i]); } @@ -127,6 +127,23 @@ public class DepartmentServiceImpl implements IDepartmentService { } @Override + public ListPager queryDepartment(Department department, Pager pager) { + LOGGER.info("部门 Department find menu :{} department :{}", department, pager); + + if (department == null) { + //不传入实体对象，查询所有 + int count = departmentRDao.listCount(); + pager = PagerHelper.getPager(pager, count); + return new ListPager(departmentRDao.listPager(pager), pager); + } else { + //生成hql查询语句 + String hqlPack = CoreHqlPack.packHqlDepartment(department); + pager = PagerHelper.getPager(pager, departmentRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(departmentRDao.findByHqlWherePage(hqlPack + department.orderBy(), pager), pager); + } + } + + @Override public Department getDepartmentById(String id) { LOGGER.info("部门信息 DEPARTMENT id:{}",id); return departmentRDao.getById(Long.parseLong(id)); @@ -136,13 +153,12 @@ public class DepartmentServiceImpl implements IDepartmentService { public ListPager findDepartmentByPager(Department department, Pager pager) { if (department == null) { pager = PagerHelper.getPager(pager, departmentRDao.listCount()); - // TODO 分页日志格式 排序 return new ListPager(departmentRDao.listPager(pager),pager); } else { String hqlPack = CoreHqlPack.packHqlDepartment(department); pager = PagerHelper.getPager(pager, departmentRDao.findByHqlWhereCount(hqlPack)); - // TODO 分页日志格式 排序 - return new ListPager(departmentRDao.findByHqlWherePage(hqlPack + department.getOrderByParam(),pager),pager); + hqlPack += department.getOrderByParam() != null ? department.getOrderByParam(): "" ; + return new ListPager(departmentRDao.findByHqlWherePage(hqlPack,pager),pager); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java index a90f379..8d2084e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; @@ -80,7 +83,7 @@ public class OrganizeServiceImpl implements IOrganizeService { .setErrorSolution("请重新操作") .build(); }else { - Long[] array = new Long[ids.length]; + long[] array = new long[ids.length]; for (int i = 0; i < ids.length; i++) { array[i] = Long.parseLong(ids[i]); } @@ -92,7 +95,7 @@ public class OrganizeServiceImpl implements IOrganizeService { public Organize insertOrganize(Organize organize) { LOGGER.info("组织 ORGANIZE :{}", organize); - if(organize.getParentId() != null){ + if(organize.getParentId() != null && organize.getParentId().intValue() > 0){ Organize org = getOrganizeById(organize.getParentId().toString()); ValidatorBean.checkNotNull(org); @@ -102,12 +105,29 @@ public class OrganizeServiceImpl implements IOrganizeService { } @Override - public List findOrganizeAll() { + public List listOrganize() { LOGGER.info("组织 ORGANIZE find All"); return organizeRDao.findAll(); } @Override + public ListPager queryOrganize(Organize organize, Pager pager) { + LOGGER.info("组织信息 Organize find Organize page"); + + if(organize == null){ + //不传入实体对象，查询所有 + int count = organizeRDao.listCount(); + pager = PagerHelper.getPager(pager,count); + return new ListPager(organizeRDao.listPager(pager),pager); + }else { + //生成hql查询语句 + String hqlPack = CoreHqlPack.packHqlOrganize(organize); + pager = PagerHelper.getPager(pager,organizeRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(organizeRDao.findByHqlWherePage(hqlPack + organize.orderBy(), pager),pager); + } + } + + @Override public Organize getOrganizeById(String id) { LOGGER.info("组织 ORGANIZE find id:{}", id); return organizeRDao.getOne(Long.parseLong(id)); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionServiceImpl.java index 83e3482..3c1cf2e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionServiceImpl.java @@ -102,7 +102,7 @@ public class PositionServiceImpl implements IPositionService { .setErrorSolution("请重新操作") .build(); }else { - Long[] array = new Long[ids.length]; + long[] array = new long[ids.length]; for (int i = 0; i < ids.length; i++) { array[i] = Long.parseLong(ids[i]); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuServiceImpl.java index 37719e9..4ef57f6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuServiceImpl.java @@ -1,11 +1,15 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import org.slf4j.Logger; @@ -94,4 +98,21 @@ public class SysMenuServiceImpl implements ISysMenuService { LOGGER.info("系统功能 SYS_MENU find id:{}", id); return sysMenuRDao.getOne(Long.parseLong(id)); } + + @Override + public ListPager querySysMenu(SysMenu menu, Pager pager) { + LOGGER.info("系统权限 SysMenu find menu :{} page :{}", menu, pager); + + if (menu == null) { + //不传入实体对象，查询所有 + int count = sysMenuRDao.listCount(); + pager = PagerHelper.getPager(pager, count); + return new ListPager(sysMenuRDao.listPager(pager), pager); + } else { + //生成hql查询语句 + String hqlPack = CoreHqlPack.packHqlSysMenu(menu); + pager = PagerHelper.getPager(pager, sysMenuRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(sysMenuRDao.findByHqlWherePage(hqlPack + menu.orderBy(), pager), pager); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java index d003b03..0d77c31 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java @@ -1,10 +1,14 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysRole; import cn.estsh.i3plus.pojo.platform.repository.SysRoleRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import org.slf4j.Logger; @@ -69,4 +73,21 @@ public class SysRoleServiceImpl implements ISysRoleService { LOGGER.info("系统角色 SYS_ROLE find id:{}", id); return sysRoleRDao.getOne(Long.parseLong(id)); } + + @Override + public ListPager querySysRole(SysRole role, Pager pager) { + LOGGER.info("系统角色 SysRole find role :{} page :{}", role, pager); + + if (role == null) { + //不传入实体对象，查询所有 + int count = sysRoleRDao.listCount(); + pager = PagerHelper.getPager(pager, count); + return new ListPager(sysRoleRDao.listPager(pager), pager); + } else { + //生成hql查询语句 + String hqlPack = CoreHqlPack.packHqlSysRole(role); + pager = PagerHelper.getPager(pager, sysRoleRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(sysRoleRDao.findByHqlWherePage(hqlPack + role.orderBy(), pager), pager); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java index 695fe3a..7e29b7a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java @@ -335,6 +335,8 @@ public class SysUserServiceImpl implements ISysUserService { sessionUser.setDepartmentList(user.getDepartmentList()); sessionUser.setPositionList(user.getPositionList()); sessionUser.setOrganize(user.getOrganize()); + sessionUser.setUser(user); + sessionUser.setUserInfo(user.getUserInfo()); if(null != user.getPositionList() && user.getPositionList().size() > 0){ sessionUser.setPosition(user.getPositionList().get(0)); diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentServiceImpl.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentServiceImpl.java new file mode 100644 index 0000000..96e6e3a --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentServiceImpl.java @@ -0,0 +1,118 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.IDepartmentService; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.Department; +import cn.estsh.i3plus.pojo.platform.bean.Organize; +import com.alibaba.fastjson.JSON; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.annotation.Rollback; + +import javax.transaction.Transactional; +import java.util.List; + +/** + * @Description : 岗位信息测试 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-29 19:02 + * @Modify : + **/ +public class TestDepartmentServiceImpl extends TestBase { + + @Autowired + private IDepartmentService departmentService; + + /** + * 新增数据 + */ + @Test + @Transactional + public void testInsertDepartment(){ + for(int i = 0 ; i < 50 ; i++ ){ + Department obj = new Department(); + obj.setName("Junit Test " + i); + obj.setDepartmentCode("TEST_JUNIT " + i); + obj.setParentId(1057165194242953216L); + obj.setOrganizeId(1057163974900060160L); + obj = departmentService.insertDepartment(obj); + System.out.println(JSON.toJSONString(obj)); + } + } + + /** + * 根据Key 数据 + * @return + */ + @Test + @Transactional + public void testGetDepartmentById(){ + Department obj = departmentService.getDepartmentById("1057163974900060160"); + System.out.println(JSON.toJSONString(obj)); + } + + /** + * 查询所有数据 + * + * @return + */ + @Test + @Transactional + public void testListDepartment(){ + List list = departmentService.listDepartment(); + System.out.println(JSON.toJSONString(list)); + } + + /** + * 根据岗位信息进行查找 + * @return + */ + @Test + @Transactional + public void testFindDepartmentByPager(){ + Organize obj = new Organize(); + + Pager pager = new Pager(); + pager.setPageSize(10); + pager.setCurrentPage(1); + + ListPager list = departmentService.queryDepartment(null, pager); + + System.out.println(JSON.toJSONString(list)); + } + + /** + * 修改数据 + */ + @Test + @Transactional + public void testUpdateDepartment(){ + Department obj = departmentService.getDepartmentById("1057108586410414080"); + obj.setName("Junit update Name "); + departmentService.updateDepartment(obj); + System.out.println(JSON.toJSONString(obj)); + } + + /** + * 根据Key 删除数据 + */ + @Test + @Transactional + public void testDeleteDepartmentById(){ +// departmentService.deleteOrganizeById(""); + } + + /** + * 根据id批量删除岗位 + * @return + */ + @Test + @Transactional + public void deleteDepartmentByIds(){ +// departmentService.deleteOrganizeByIds(new String[]{"1057108585445724160","1057108585760296960"}); + } + + +} diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeServiceImpl.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeServiceImpl.java new file mode 100644 index 0000000..0e55dfa --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeServiceImpl.java @@ -0,0 +1,118 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.Organize; +import cn.estsh.i3plus.pojo.platform.bean.Organize; +import com.alibaba.fastjson.JSON; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.annotation.Rollback; + +import javax.transaction.Transactional; +import java.util.List; + +/** + * @Description : 岗位信息测试 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-29 19:02 + * @Modify : + **/ +public class TestOrganizeServiceImpl extends TestBase { + + @Autowired + private IOrganizeService organizeService; + + /** + * 新增数据 + */ + @Test + @Transactional + @Rollback(false) + public void testInsertOrganize(){ + for(int i = 0 ; i < 50 ; i++ ){ + Organize obj = new Organize(); + obj.setName("Junit Test " + i); + obj.setOrganizeCode("TEST_JUNIT " + i); + obj.setParentId(-1L); + obj = organizeService.insertOrganize(obj); + System.out.println(JSON.toJSONString(obj)); + } + } + + /** + * 根据Key 数据 + * @return + */ + @Test + @Transactional + public void testGetOrganizeById(){ + Organize obj = organizeService.getOrganizeById("1057163974900060160"); + System.out.println(JSON.toJSONString(obj)); + } + + /** + * 查询所有数据 + * + * @return + */ + @Test + @Transactional + public void testListOrganize(){ + List list = organizeService.listOrganize(); + System.out.println(JSON.toJSONString(list)); + } + + /** + * 根据岗位信息进行查找 + * @return + */ + @Test + @Transactional + public void testFindOrganizeByPager(){ + Organize obj = new Organize(); + + Pager pager = new Pager(); + pager.setPageSize(10); + pager.setCurrentPage(1); + + ListPager list = organizeService.queryOrganize(null, pager); + + System.out.println(JSON.toJSONString(list)); + } + + /** + * 修改数据 + */ + @Test + @Transactional + public void testUpdateOrganize(){ + Organize obj = organizeService.getOrganizeById("1057108586410414080"); + obj.setName("Junit update Name "); + organizeService.updateOrganize(obj); + System.out.println(JSON.toJSONString(obj)); + } + + /** + * 根据Key 删除数据 + */ + @Test + @Transactional + public void testDeleteOrganizeById(){ +// organizeService.deleteOrganizeById(""); + } + + /** + * 根据id批量删除岗位 + * @return + */ + @Test + @Transactional + public void deleteOrganizeByIds(){ +// organizeService.deleteOrganizeByIds(new String[]{"1057108585445724160","1057108585760296960"}); + } + + +}