diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java index bce8695..7232b7d 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java @@ -1,5 +1,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.SysFile; import java.util.List; @@ -43,4 +45,12 @@ public interface ISysFileService { * @return */ SysFile getSysFileById(String id); + + /** + * 文件资源查询，分页，排序 + * @param sysFile + * @param pager + * @return + */ + ListPager querySysFileByPager(SysFile sysFile, Pager pager); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java index 0cd29f5..c5e33b3 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java @@ -47,10 +47,31 @@ public interface ISysMessageService { SysMessage getSysMessageById(String id); /** - * 系统消息复制查询，分页，排序 + * 系统消息复杂查询，分页，排序 * @param sysMessage * @param pager * @return */ ListPager querySysMessageByPager(SysMessage sysMessage, Pager pager); + + /** + * 根据id修改消息状态 + * @param id + * @param status + */ + void updateSysMessageStatusById(String id,Integer status); + + /** + * 批量删除系统消息 + * @param ids + */ + void deleteSysMessageByIds(String[] ids); + + + /** + * 批量修改消息状态 + * @param ids + * @param status + */ + void updateSysMessageStatusByIds(String[] ids,Integer status); } 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 2dcc28f..441b06d 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 @@ -2,6 +2,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.RefRoleMenu; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.bean.SysRole; @@ -57,6 +58,27 @@ public interface ISysRoleService { SysRole insertSysRole(SysRole sysRole); /** + * 刷新角色权限 + * @param roleId + * @param ids + */ + void refreshSysRoleRef(String roleId,String[] ids,SessionUser user); + + /** + * 刷新角色权限 + * @param roleIds + * @param ids + */ + void refreshBatchSysRoleRef(String[] roleIds,String[] ids,SessionUser user); + + /** + * + * @param roleId + * @return + */ + List findRefRoleMenuByRoleId(String roleId); + + /** * 查询所有数据 * * @return diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java similarity index 77% rename from modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysUserService.java rename to modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index d909eb2..b8980c4 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java @@ -1,5 +1,7 @@ -package cn.estsh.i3plus.core.api.iservice.base; +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.*; import java.util.List; @@ -32,6 +34,14 @@ public interface ISysUserService { void updateSysUserStatus(String id, int status, SessionUser user); /** + * 批量修改用户状态 + * @param ids + * @param status + * @param user + */ + void updateBatchSysUserStatus(String[] ids, int status, SessionUser user); + + /** * 修改用户信息 * @param sysUser */ @@ -76,12 +86,27 @@ public interface ISysUserService { void deleteSysUserById(String id); /** + * 批量删除用户 逻辑删除 + * @param ids 需要删除的用户ID + * @param user 当前会话用户 + */ + void deleteBatchSysUserById(String[] ids, SessionUser user); + + /** * 查询所有数据 * @return */ List list(); /** + * 复杂查询 + * @param user + * @param pager + * @return + */ + ListPager querySysUserByPager(SysUser user, Pager pager); + + /** * 根据id 数据 * @param id * @return diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeExpressionService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeExpressionService.java index 154b09e..4df32a6 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeExpressionService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeExpressionService.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.SysFile; import cn.estsh.i3plus.pojo.platform.bean.SysRole; import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression; @@ -38,7 +41,7 @@ public interface ITaskTimeExpressionService { * 查询所有数据 * @return */ - List findTaskTimeExpressionAll(); + List listTaskTimeExpression(); /** * 根据ID 查询任务表达式 @@ -47,4 +50,11 @@ public interface ITaskTimeExpressionService { */ TaskTimeExpression getTaskTimeExpressionById(String id); + /** + * 任务表达式查询，分页，排序 + * @param taskTimeExpression + * @param pager + * @return + */ + ListPager queryTaskTimeExpressionByPager(TaskTimeExpression taskTimeExpression, Pager pager); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeService.java index b1af89d..3d788d6 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeService.java @@ -1,7 +1,10 @@ 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.TaskTime; +import org.springframework.data.domain.Page; import java.util.List; @@ -53,4 +56,12 @@ public interface ITaskTimeService { * @return */ TaskTime getTaskTimeById(String id); + + /** + * 定时任务复制查询，分页，排序 + * @param taskTime + * @param pager + * @return + */ + ListPager queryTaskTimeByPager(TaskTime taskTime, 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 cad395c..675cd4a 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 @@ -1,11 +1,8 @@ package cn.estsh.i3plus.core.apiservice.controller.base; -import cn.estsh.i3plus.core.api.iservice.base.ISysUserService; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; -import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; 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; 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 daaae43..dc945d2 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 @@ -157,7 +157,7 @@ public class DepartmentController { } @GetMapping(value = "/query") - @ApiOperation(value = "根据名称和代码查询部门", notes = "根据名称和代码查询部门") + @ApiOperation(value = "查询部门", notes = "组合查询部门信息外加分页信息") public ResultBean queryDepartment(Department department, Pager pager) { try { ListPager departmentListPager = departmentService.findDepartmentByPager(department, pager); 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 b5f51d7..7ffbaea 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 @@ -125,7 +125,7 @@ public class OrganizeController { } @GetMapping(value="/query") - @ApiOperation(value="查询所有组织",notes="查询所有组织") + @ApiOperation(value="查询组织",notes="组合查询组织外加分页") public ResultBean queryPosition(Organize organize, Pager pager){ try{ ListPager listPager = organizeService.queryOrganize(organize, pager); @@ -163,12 +163,12 @@ public class OrganizeController { } @PutMapping(value = "/status") - @ApiOperation(value = "修改权限状态", notes = "根据ID修改权限状态") + @ApiOperation(value = "修改组织状态", notes = "根据ID修改组织状态") public ResultBean updateStatus(String id, int status) { try { // 数据校验 - ValidatorBean.checkNotNull(id, "角色id 不能为空"); - ValidatorBean.checkNotZero(status, "角色状态不能为空"); + ValidatorBean.checkNotNull(id, "组织id 不能为空"); + ValidatorBean.checkNotZero(status, "组织状态不能为空"); organizeService.updateOrganizeStatus(id, status, AuthUtil.getSessionUser()); return new ResultBean(true); 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 bfe2454..a0fd8c3 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 @@ -132,7 +132,7 @@ public class PositionController { } @GetMapping(value="/query") - @ApiOperation(value="查询所有岗位",notes="查询所有岗位") + @ApiOperation(value="查询岗位",notes="复杂查询岗位带分页") public ResultBean queryPosition(Position position,Pager pager){ try{ ListPager listPager = positionService.queryPosition(position, pager); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java index b6b9717..ce8c5cf 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java @@ -2,9 +2,12 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; 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.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysFile; +import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; @@ -129,4 +132,19 @@ public class SysFileController { return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + @GetMapping(value = "/query") + @ApiOperation(value = "文件资源复杂查询，分页，排序",notes = "文件资源复杂查询，分页，排序") + public ResultBean querySysFileByPager(SysFile sysFile, Pager pager){ + try { + ListPager sysFileListPager = sysFileService.querySysFileByPager(sysFile,pager); + return ResultBean.success("查询成功").setListPager(sysFileListPager).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()); + } + } } \ No newline at end of file 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 69c2eff..92a42be 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 @@ -46,6 +46,7 @@ public class SysMenuController { //条件验证 ValidatorBean.beginValid(menu) .notNull("name", menu.getName()) + .notNull("menuCode", menu.getMenuCode()) .notNull("menuTypeId", menu.getMenuTypeId()); //新增初始化 @@ -53,6 +54,7 @@ public class SysMenuController { if(menu.getParentId() == null || menu.getParentId().intValue() == 0){ menu.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); } + menu.setMenuStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); menu = sysMenuService.insertSysMenu(menu); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(menu); @@ -72,6 +74,7 @@ public class SysMenuController { ValidatorBean.beginValid(sysMenu) .notNull("id", sysMenu.getId()) .notNull("menuTypeId", sysMenu.getMenuTypeId()) + .notNull("menuCode", sysMenu.getMenuCode()) .notNull("name", sysMenu.getName()); ConvertBean.modelUpdate(sysMenu, AuthUtil.getSessionUser()); @@ -122,7 +125,7 @@ public class SysMenuController { } @GetMapping(value="/query") - @ApiOperation(value="查询所有权限",notes="查询所有权限") + @ApiOperation(value="查询权限",notes="组合查询权限，外带分页功能") public ResultBean queryPosition(SysMenu menu, Pager pager){ try{ ListPager listPager = sysMenuService.querySysMenu(menu, pager); @@ -200,4 +203,6 @@ public class SysMenuController { } + + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java index 613bba4..9dba1bb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java @@ -4,12 +4,14 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; 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.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -57,7 +59,6 @@ public class SysMessageController { sysMessage.setMessageSendId(user.getUser().getId()); sysMessage.setRedSendName(user.getUser().getName()); sysMessage.setMessageStatusId(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue()); - // TODO 状态 status sysMessageService.insertSysMessage(sysMessage); return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -102,11 +103,8 @@ public class SysMessageController { .checkNotZero("messageType",sysMessage.getMessageTypeId()) .notNull("messageRecipientId",sysMessage.getMessageRecipientId()); - // 添加初始化 + // 修改初始化 ConvertBean.modelUpdate(sysMessage,user); - // sysMessage.setMessageSendId(user.getUser().getId()); - // sysMessage.setRedSendName(user.getUser().getName()); - // TODO 状态 status sysMessageService.updateSysMessage(sysMessage); return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -163,4 +161,66 @@ public class SysMessageController { return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + @PutMapping("/status") + public ResultBean updateSysMessageStatusById(String id,Integer status){ + try { + // 条件校验 + ValidatorBean.checkNotNull(id,"id不能为空"); + ValidatorBean.checkNotZero(status,"修改状态值不能为空"); + + sysMessageService.updateSysMessageStatusById(id,status); + return ResultBean.success("修改成功").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()); + } + } + + @DeleteMapping("/batch-delete") + @ApiOperation(value = "批量删除消息",notes = "批量删除消息") + public ResultBean deleteSysMessageByIds(String[] ids){ + try{ + if(ids.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + sysMessageService.deleteSysMessageByIds(ids); + return ResultBean.success("删除成功").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()); + } + } + + @DeleteMapping("/batch-status") + @ApiOperation(value = "批量切换消息状态",notes = "批量切换消息状态") + public ResultBean deleteSysMessageByIds(String[] ids,Integer status){ + try{ + if(ids.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要操作的资源。") + .build(); + } + sysMessageService.updateSysMessageStatusByIds(ids,status); + return ResultBean.success("操作成功").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()); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index 2fa1a3e..41a619b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -4,12 +4,13 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService; 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.SessionUser; -import cn.estsh.i3plus.pojo.platform.bean.SysMenu; +import cn.estsh.i3plus.pojo.platform.bean.RefRoleMenu; import cn.estsh.i3plus.pojo.platform.bean.SysRole; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -20,7 +21,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.websocket.server.PathParam; import java.util.List; /** @@ -37,7 +37,6 @@ public class SysRoleController { public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleController.class); - @Autowired private ISysRoleService sysRoleService; @@ -51,6 +50,9 @@ public class SysRoleController { //新增初始化 ConvertBean.modelInitialize(role, AuthUtil.getSessionUser()); + role.setRoleStatusId(CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); + role.setRedMenuNumber(0); + role.setRedModuleNumber(0); role = sysRoleService.insertSysRole(role); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(role); @@ -118,8 +120,27 @@ public class SysRoleController { } } + @GetMapping(value = "/find-ref-menu/{roleId}") + @ApiOperation(value = "查询角色的所有角色权限关系", notes = "查询角色的所有角色权限关系") + public ResultBean findRefRoleMenu(@PathVariable("roleId") String roleId) { + try { + ValidatorBean.checkNotNull(roleId, "角色id 不能为空"); + + List list = sysRoleService.findRefRoleMenuByRoleId(roleId); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(list); + } 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="/query") - @ApiOperation(value="查询所有角色",notes="查询所有角色") + @ApiOperation(value="查询角色",notes="组合查询角色，外带分页功能") public ResultBean querySysRole(SysRole role, Pager pager){ try{ ListPager listPager = sysRoleService.querySysRole(role, pager); @@ -179,6 +200,8 @@ public class SysRoleController { @ApiOperation(value = "批量修改系统角色状态", notes = "根据ID修改系统角色状态") public ResultBean updateBatchStatus(String[] ids,int status) { try { + ids = ConvertBean.modelSafeArrayNumber(ids,true); + // 数据校验 ValidatorBean.checkNotNull(ids, "角色id 不能为空"); ValidatorBean.checkNotZero(status, "角色状态不能为空"); @@ -194,4 +217,54 @@ public class SysRoleController { return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()); } } + + @PutMapping(value = "/ref-menu/insert") + @ApiOperation(value = "新增角色权限关系", notes = "新增角色权限关系") + public ResultBean insertRefMenu(String roleId,String[] refIds) { + try { + // 数据校验 + ValidatorBean.checkNotNull(roleId, "角色roleId 不能为空"); + + ConvertBean.modelSafeArrayNumber(refIds,true); + + sysRoleService.refreshSysRoleRef(roleId,refIds,AuthUtil.getSessionUser()); + + return ResultBean.success("操作成功").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.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()); + } + } + + @PutMapping(value = "/ref-menu/batch-insert") + @ApiOperation(value = "批量新增角色权限关系", notes = "批量新增角色权限关系") + public ResultBean insertBatchRefMenu(String[] roleIds,String[] menuIds) { + try { + // 数据校验 + ValidatorBean.checkNotNull(roleIds, "角色roleIds 不能为空"); + + roleIds = ConvertBean.modelSafeArrayNumber(roleIds,true); + + if(roleIds.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请输入需要更新的角色信息。") + .build(); + } + + sysRoleService.refreshBatchSysRoleRef(roleIds,menuIds,AuthUtil.getSessionUser()); + + return ResultBean.success("操作成功").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.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 1ebd659..f28a7f1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; -import cn.estsh.i3plus.core.api.iservice.base.ISysUserService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; 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.SysUser; @@ -38,7 +40,6 @@ public class SysUserController { @Autowired private ISysUserService sysUserService; - @PostMapping(value = "/insert") @ApiOperation(value = "新增用户", notes = "新增系统用户") public ResultBean insertSysUser(SysUser sysUser,String departmentId,String positionId ,String[] roleIds) { @@ -152,6 +153,29 @@ public class SysUserController { } } + @GetMapping(value="/query-user-by-pager") + @ApiOperation(value="查询系统用户",notes="组合查询用户，外带分页查询(isValid = 1)") + public ResultBean querySysUserByPager(SysUser user, Pager pager){ + try{ + // 初始化用户查询讯息 + if(null == user) { + user = new SysUser(); + } + user.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue()); + + ListPager listPager = sysUserService.querySysUserByPager(user, 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()); + } + } + @DeleteMapping(value = "/delete") @ApiOperation(value = "删除定时任务", notes = "删除定时任务") public ResultBean delete(String id) { @@ -189,4 +213,48 @@ public class SysUserController { } } + @DeleteMapping(value = "/batch-delete") + @ApiOperation(value = "根据id批量删除", notes = "根据id批量删除") + public ResultBean deleteBatchSysUserByIds(String[] ids){ + try{ + if(ids.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的用户。") + .build(); + } + + sysUserService.deleteBatchSysUserById(ids,AuthUtil.getSessionUser()); + return ResultBean.success("删除成功") + .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()); + } + } + + @PutMapping(value = "/batch-status") + @ApiOperation(value = "批量修改系统功能状态", notes = "根据ID修改系统功能状态") + public ResultBean updateBatchStatus(String[] ids,int status) { + try { + // 数据校验 + ValidatorBean.checkNotNull(ids, "功能id 不能为空"); + ValidatorBean.checkNotZero(status, "功能状态不能为空"); + + sysUserService.updateBatchSysUserStatus(ids,status,AuthUtil.getSessionUser()); + + return ResultBean.success("操作成功").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.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()); + } + } + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java index 63a86ee..b0b269c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService; import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeService; 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.*; import cn.estsh.impp.framework.boot.auth.AuthUtil; @@ -181,4 +183,19 @@ public class TaskTimeController { return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()); } } + + @GetMapping("/query") + @ApiOperation(value = "定时任务复杂查询，分页，排序",notes = "定时任务复杂查询，分页，排序") + public ResultBean queryTaskTimeByPager(TaskTime taskTime, Pager pager){ + try { + ListPager taskTimeListPager = taskTimeService.queryTaskTimeByPager(taskTime,pager); + return ResultBean.success("查询成功").setListPager(taskTimeListPager).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()); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java index 25b97ed..5f04bd2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService; 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.TaskTimeExpression; import cn.estsh.impp.framework.boot.auth.AuthUtil; @@ -110,7 +112,7 @@ public class TaskTimeExpressionController { @ApiOperation(value = "查询时间表达式所有", notes = "查询所有系统时间表达式") public ResultBean findTaskTimeExpressionAll() { try { - List list = taskTimeExpressionService.findTaskTimeExpressionAll(); + List list = taskTimeExpressionService.listTaskTimeExpression(); return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultList(list); @@ -125,7 +127,7 @@ public class TaskTimeExpressionController { @GetMapping(value = "/get/{id}") @ApiOperation(value = "查询系统时间表达式", notes = "查询根据ID查询系统时间表达式") - public ResultBean getByTaskTimeExpressionId(@PathVariable("id") String id) { + public ResultBean getTaskTimeExpressionById(@PathVariable("id") String id) { try { // 数据校验 ValidatorBean.checkNotNull(id, "定时任务id 不能为空"); @@ -143,4 +145,19 @@ public class TaskTimeExpressionController { return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + @GetMapping("query") + @ApiOperation(value = "时间表达式查询，分页，排序",notes = "时间表达式查询，分页，排序") + public ResultBean queryTaskTimeExpressionByPager(TaskTimeExpression taskTimeExpression, Pager pager){ + try { + ListPager taskTimeExpressionListPager = taskTimeExpressionService.queryTaskTimeExpressionByPager(taskTimeExpression,pager); + return ResultBean.success("查询成功").setListPager(taskTimeExpressionListPager).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()); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java index 78d561b..da84501 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java @@ -162,7 +162,7 @@ public class ToolTypeController { } } - @DeleteMapping("/batch-delete") + @DeleteMapping(value = "/batch-delete") @ApiOperation(value = "批量删除硬件类型",notes = "批量删除硬件类型") public ResultBean deleteToolTypeByIds(String[] ids){ try{ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/UserPermissionDaoImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/UserPermissionDaoImpl.java index f494ff0..fdbd6bc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/UserPermissionDaoImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/UserPermissionDaoImpl.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.core.apiservice.daoimpl; import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao; -import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.CoreTreeServiceImpl; import cn.estsh.i3plus.pojo.platform.bean.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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/CoreTreeService.java similarity index 91% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java index 217c145..f5336aa 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/CoreTreeService.java @@ -7,7 +7,6 @@ import cn.estsh.i3plus.pojo.platform.repository.OrganizeRepository; import cn.estsh.i3plus.pojo.platform.repository.PositionRepository; import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository; import cn.estsh.impp.framework.boot.util.ValidatorBean; -import javafx.scene.layout.VBox; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -22,11 +21,10 @@ import java.util.List; * @Date : 2018-10-24 11:17 * @Modify : **/ -//TODO for -> 传统for @Service -public class CoreTreeServiceImpl implements ICoreTreeService { +public class CoreTreeService implements ICoreTreeService { - public static final Logger LOGGER = LoggerFactory.getLogger(CoreTreeServiceImpl.class); + public static final Logger LOGGER = LoggerFactory.getLogger(CoreTreeService.class); @Autowired private DepartmentRepository departmentRDao; @@ -46,7 +44,9 @@ public class CoreTreeServiceImpl implements ICoreTreeService { // 循环设置子集 if(result != null && result.size() > 0){ - result.stream().forEach(position -> findPositionChildrenTreePack(position,0)); + for (Position position : result) { + findPositionChildrenTreePack(position,0); + } } return result; @@ -86,7 +86,9 @@ public class CoreTreeServiceImpl implements ICoreTreeService { // 循环设置子集 if(result != null && result.size() > 0){ - result.stream().forEach(department -> findDepartmentChildrenTreePack(department,0)); + for (Department department : result) { + findDepartmentChildrenTreePack(department,0); + } } return result; @@ -126,7 +128,9 @@ public class CoreTreeServiceImpl implements ICoreTreeService { // 循环设置子集 if(result != null && result.size() > 0){ - result.stream().forEach(organize -> findOrganizeChildrenTreePack(organize,0)); + for (Organize organize : result) { + findOrganizeChildrenTreePack(organize,0); + } } return result; @@ -165,7 +169,9 @@ public class CoreTreeServiceImpl implements ICoreTreeService { // 循环设置子集 if(result != null && result.size() > 0){ - result.stream().forEach(menu -> findSysMenuChildrenTreePack(menu,0)); + for (SysMenu menu : result) { + findSysMenuChildrenTreePack(menu,0); + } } return result; 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/DepartmentService.java similarity index 64% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentService.java index 67d7662..76ad476 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/DepartmentService.java @@ -28,8 +28,8 @@ import java.util.List; * @Modify : **/ @Service -public class DepartmentServiceImpl implements IDepartmentService { - public static final Logger LOGGER = LoggerFactory.getLogger(DepartmentServiceImpl.class); +public class DepartmentService implements IDepartmentService { + public static final Logger LOGGER = LoggerFactory.getLogger(DepartmentService.class); @Autowired private DepartmentRepository departmentRDao; @@ -39,34 +39,49 @@ public class DepartmentServiceImpl implements IDepartmentService { @Override public Department insertDepartment(Department department) { - if (department.getParentId() != null && department.getParentId().intValue() > 0) { - LOGGER.info("部门信息 DEPARTMENT :{}", department.getParentId()); - Department parentPosition = departmentRDao.getById(department.getParentId()); - ValidatorBean.checkNotNull(parentPosition); - - department.setRedParentName(parentPosition.getName()); - } + LOGGER.info("部门信息 Department department:{}", department); + // 代码唯一校验 + long count = organizeRDao.findByPropertyCount("departmentCode", department.getDepartmentCode()); + if(count <= 0){ + + //冗余父节点信息 + if (department.getParentId() != null && department.getParentId().intValue() > 0) { + LOGGER.info("部门信息 DEPARTMENT :{}", department.getParentId()); + Department parentPosition = departmentRDao.getById(department.getParentId()); + ValidatorBean.checkNotNull(parentPosition); + + department.setRedParentName(parentPosition.getName()); + } - LOGGER.info("组织信息 ORGANIZE :{}", department.getOrganizeId()); - Organize organize = organizeRDao.getById(department.getOrganizeId()); - ValidatorBean.checkNotNull(organize); + LOGGER.info("组织信息 ORGANIZE :{}", department.getOrganizeId()); + Organize organize = organizeRDao.getById(department.getOrganizeId()); + ValidatorBean.checkNotNull(organize); - department.setRedOrganizeName(organize.getName()); + department.setRedOrganizeName(organize.getName()); - LOGGER.info("部门信息 DEPARTMENT {}",department); - return departmentRDao.insert(department); + LOGGER.info("部门信息 DEPARTMENT {}",department); + return departmentRDao.insert(department); + } else { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) + .setErrorDetail("部门代码已存在") + .setErrorSolution("请重新输入部门代码") + .build(); + } } @Override public void deleteDepartmentById(String id) { + LOGGER.info("部门信息 Department id :{}", id); // 查询是否存在子级 LOGGER.info("部门信息 DEPARTMENT :{}", id); if (departmentRDao.findByPropertyCount("parentId",Long.parseLong(id)) > 0) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.WMS.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("存在子节点无法删除！") - .setErrorSolution("请重新操作") + .setErrorDetail("存在相关部门信息无法删除！") + .setErrorSolution("请先删除子集信息在操作") .build(); } @@ -77,16 +92,17 @@ public class DepartmentServiceImpl implements IDepartmentService { @Override public void deleteDepartmentByIds(String[] ids) { + LOGGER.info("部门信息 DEPARTMENT ids :{}", ids); long positionCount = departmentRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); if (positionCount >= 1) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("存在子节点无法删除！") - .setErrorSolution("请重新操作") + .setErrorDetail("存在相关部门信息无法删除！") + .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]); } @@ -96,6 +112,22 @@ public class DepartmentServiceImpl implements IDepartmentService { @Override public void updateDepartment(Department department) { + LOGGER.info("部门信息 DEPARTMENT department :{}", department); + // 唯一校验 CODE 相同 ID 不同 则视为相同 + List list = departmentRDao.findByProperty("departmentCode", department.getDepartmentCode()); + if(null != list && list.size() > 0){ + for (Department dep : list) { + if(!dep.getId().equals(department.getId())){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) + .setErrorDetail("部门代码已存在") + .setErrorSolution("请重新输入部门代码") + .build(); + } + } + } + // 查询父级部门名称 if (department.getParentId() != null && department.getParentId() > 0) { LOGGER.info("部门信息 DEPARTMENT :{}", department.getParentId()); @@ -148,14 +180,17 @@ public class DepartmentServiceImpl implements IDepartmentService { @Override public ListPager findDepartmentByPager(Department department, Pager pager) { + LOGGER.info("部门信息 DEPARTMENT department :{}", department); + LOGGER.info("部门信息 DEPARTMENT pager :{}", pager); + if (department == null) { pager = PagerHelper.getPager(pager, departmentRDao.listCount()); return new ListPager(departmentRDao.listPager(pager),pager); } else { String hqlPack = CoreHqlPack.packHqlDepartment(department); pager = PagerHelper.getPager(pager, departmentRDao.findByHqlWhereCount(hqlPack)); - hqlPack += department.getOrderByParam() != null ? department.getOrderByParam(): "" ; - return new ListPager(departmentRDao.findByHqlWherePage(hqlPack,pager),pager); + return new ListPager(departmentRDao.findByHqlWherePage( + hqlPack + department.getOrderByParam(),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/OrganizeService.java similarity index 65% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeService.java index 6494ac8..52b2218 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/OrganizeService.java @@ -5,7 +5,9 @@ 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.Organize; +import cn.estsh.i3plus.pojo.platform.bean.Position; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.repository.OrganizeRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; @@ -27,9 +29,9 @@ import java.util.List; * @Modify : **/ @Service -public class OrganizeServiceImpl implements IOrganizeService { +public class OrganizeService implements IOrganizeService { - public static final Logger LOGGER = LoggerFactory.getLogger(OrganizeServiceImpl.class); + public static final Logger LOGGER = LoggerFactory.getLogger(OrganizeService.class); @Autowired private OrganizeRepository organizeRDao; @@ -37,7 +39,22 @@ public class OrganizeServiceImpl implements IOrganizeService { @Override public void updateOrganize(Organize organize) { LOGGER.info("组织 ORGANIZE :{}", organize); + // 唯一校验 CODE 相同 ID 不同 则视为相同 + List list = organizeRDao.findByProperty("organizeCode", organize.getOrganizeCode()); + if(null != list && list.size() > 0){ + for (Organize org : list) { + if(!org.getId().equals(organize.getId())){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) + .setErrorDetail("组织代码已存在") + .setErrorSolution("请重新输入组织代码") + .build(); + } + } + } + // 冗余父节点 if(organize.getParentId() != null){ Organize org = getOrganizeById(organize.getParentId().toString()); ValidatorBean.checkNotNull(org); @@ -45,6 +62,7 @@ public class OrganizeServiceImpl implements IOrganizeService { organize.setRedParentName(org.getName()); } + // 更新数据 organizeRDao.update(organize); } @@ -65,8 +83,8 @@ public class OrganizeServiceImpl implements IOrganizeService { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) - .setErrorDetail("该数据有子集") - .setErrorSolution("请先删除子集在操作") + .setErrorDetail("存在相关组织信息无法删除！") + .setErrorSolution("请先删除子集信息在操作") .build(); } organizeRDao.deleteById(Long.parseLong(id)); @@ -79,11 +97,11 @@ public class OrganizeServiceImpl implements IOrganizeService { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("存在子节点无法删除！") - .setErrorSolution("请重新操作") + .setErrorDetail("存在相关组织信息无法删除！") + .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]); } @@ -95,13 +113,27 @@ public class OrganizeServiceImpl implements IOrganizeService { public Organize insertOrganize(Organize organize) { LOGGER.info("组织 ORGANIZE :{}", organize); - if(organize.getParentId() != null && organize.getParentId().intValue() > 0){ - Organize org = getOrganizeById(organize.getParentId().toString()); - ValidatorBean.checkNotNull(org); + // 代码唯一校验 + long count = organizeRDao.findByPropertyCount("organizeCode", organize.getOrganizeCode()); + if(count <= 0){ + // 冗余信息 + if(organize.getParentId() != null && organize.getParentId().intValue() > 0){ + Organize org = getOrganizeById(organize.getParentId().toString()); + ValidatorBean.checkNotNull(org); - organize.setRedParentName(org.getName()); + organize.setRedParentName(org.getName()); + } + + // 插入数据入库 + return organizeRDao.insert(organize); + } else { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) + .setErrorDetail("组织代码已存在") + .setErrorSolution("请重新输入组织代码") + .build(); } - return organizeRDao.insert(organize); } @Override 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/PositionService.java similarity index 64% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionServiceImpl.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionService.java index 69a250c..f3e92b3 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/PositionService.java @@ -5,6 +5,7 @@ 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.Position; import cn.estsh.i3plus.pojo.platform.repository.PositionRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; @@ -26,30 +27,59 @@ import java.util.List; * @Modify : **/ @Service -public class PositionServiceImpl implements IPositionService { - public static final Logger LOGGER = LoggerFactory.getLogger(PositionServiceImpl.class); +public class PositionService implements IPositionService { + public static final Logger LOGGER = LoggerFactory.getLogger(PositionService.class); @Autowired private PositionRepository positionRDao; @Override public Position insertPosition(Position position) { - // 查询父级岗位名称 - if (position.getParentId() != null && position.getParentId() > 0) { - LOGGER.info("岗位信息 POSITION parentId:{}", position.getParentId()); + LOGGER.info("岗位信息 POSITION position:{}", position); + // CODE 唯一校验 + long count = positionRDao.findByPropertyCount("positionCode", position.getPositionCode()); + if(count > 0){ + // 查询父级岗位名称 + if (position.getParentId() != null && position.getParentId() > 0) { + LOGGER.info("岗位信息 POSITION parentId:{}", position.getParentId()); + + Position parentPosition = positionRDao.getById(position.getParentId()); + ValidatorBean.checkNotNull(parentPosition); + position.setRedParentName(parentPosition.getName()); + } - Position parentPosition = positionRDao.getById(position.getParentId()); - ValidatorBean.checkNotNull(parentPosition); - position.setRedParentName(parentPosition.getName()); + // 添加岗位 + LOGGER.info("岗位信息 POSITION position:{}", position); + return positionRDao.insert(position); + }else { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) + .setErrorDetail("岗位代码已存在") + .setErrorSolution("请重新输入岗位代码") + .build(); } - - // 添加岗位 - LOGGER.info("岗位信息 POSITION position:{}", position); - return positionRDao.insert(position); } @Override public void updatePosition(Position position) { + LOGGER.info("岗位信息 POSITION position:{}", position); + + // 唯一校验 CODE 相同 ID 不同 则视为相同 + List list = positionRDao.findByProperty("organizeCode", position.getPositionCode()); + if(null != list && list.size() > 0){ + for (Position pos : list) { + if(!pos.getId().equals(position.getId())){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) + .setErrorDetail("岗位代码已存在") + .setErrorSolution("请重新输入岗位代码") + .build(); + } + } + } + // 查询父级岗位名称 if (position.getParentId() != null && position.getParentId() > 0) { LOGGER.info("岗位信息 POSITION parentId:{}", position.getParentId()); @@ -73,8 +103,8 @@ public class PositionServiceImpl implements IPositionService { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("存在子节点无法删除！") - .setErrorSolution("请重新操作") + .setErrorDetail("存在相关岗位信息无法删除！") + .setErrorSolution("请先删除子集信息在操作") .build(); } @@ -85,20 +115,22 @@ public class PositionServiceImpl implements IPositionService { @Override public void deletePositionByIds(String[] ids) { + LOGGER.info("岗位信息 POSITION ids:{}", ids); long positionCount = positionRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); - if (positionCount >= 1) { + // 判断是否有子节点 + if (positionCount <= 0) { + Long[] array = new Long[ids.length]; + for (int i = 0; i < ids.length; i++) { + array[i] = Long.parseLong(ids[i]); + } + positionRDao.deleteByIds(array); + }else { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("存在子节点无法删除！") + .setErrorDetail("存在相关岗位信息无法删除！") .setErrorSolution("请重新操作") .build(); - }else { - long[] array = new long[ids.length]; - for (int i = 0; i < ids.length; i++) { - array[i] = Long.parseLong(ids[i]); - } - positionRDao.deleteByIds(array); } } @@ -127,12 +159,15 @@ public class PositionServiceImpl implements IPositionService { @Override public Position getPositionById(String id) { - LOGGER.info("岗位信息 根据Id查询岗位信息 id:{}", id); + LOGGER.info("岗位信息 Position id:{}", id); return positionRDao.getById(Long.parseLong(id)); } @Override public ListPager findPositionByPager(Position position, Pager pager) { + LOGGER.info("岗位信息 Position position", position); + LOGGER.info("岗位信息 Position pager:{}", pager); + if (position == null) { pager = PagerHelper.getPager(pager, positionRDao.listCount()); return new ListPager(positionRDao.listPager(pager),pager); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java index 8193977..2a43a63 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java @@ -1,8 +1,12 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; +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.platform.bean.SysFile; import cn.estsh.i3plus.pojo.platform.repository.SysFileRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -53,4 +57,17 @@ public class SysFileServiceImpl implements ISysFileService { LOGGER.info("文件资源 SYS_FILE id:{}",id); return sysFileRDao.getById(Long.parseLong(id)); } + + @Override + public ListPager querySysFileByPager(SysFile sysFile, Pager pager) { + LOGGER.info("文件资源 SYS_FILE sysFile:{}，Pager:{}",sysFile,pager); + if(sysFile == null) { + pager = PagerHelper.getPager(pager, sysFileRDao.listCount()); + return new ListPager(sysFileRDao.listPager(pager),pager); + }else { + String hqlPack = CoreHqlPack.packHqlSysFile(sysFile); + pager = PagerHelper.getPager(pager, sysFileRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(sysFileRDao.findByHqlWherePage(hqlPack + sysFile.orderBy(),pager),pager); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java index ca13357..e0e096e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java @@ -6,6 +6,7 @@ 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.Organize; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository; @@ -37,6 +38,22 @@ public class SysMenuService implements ISysMenuService { @Override public void updateSysMenu(SysMenu sysMenu) { LOGGER.info("系统功能 SYS_MENU :{}", sysMenu); + + // 唯一校验 CODE 相同 ID 不同 则视为相同 + List list = sysMenuRDao.findByProperty("menuCode", sysMenu.getMenuCode()); + if(null != list && list.size() > 0){ + for (SysMenu menu : list) { + if(!menu.getId().equals(sysMenu.getId())){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) + .setErrorDetail("权限代码已存在") + .setErrorSolution("请重新输入权限代码") + .build(); + } + } + } + sysMenuRDao.update(sysMenu); } @@ -77,14 +94,25 @@ public class SysMenuService implements ISysMenuService { @Override public SysMenu insertSysMenu(SysMenu sysMenu) { LOGGER.info("系统功能 SYS_MENU :{}", sysMenu); - if (sysMenu.getParentId() != null && sysMenu.getParentId().intValue() > 0) { - SysMenu parent = sysMenuRDao.getById(sysMenu.getParentId()); - if(null != parent){ - sysMenu.setRedParentName(parent.getName()); - } + // 代码唯一校验 + long count = sysMenuRDao.findByPropertyCount("menuCode", sysMenu.getMenuCode()); + if(count <= 0){ + if (sysMenu.getParentId() != null && sysMenu.getParentId().intValue() > 0) { + SysMenu parent = sysMenuRDao.getById(sysMenu.getParentId()); + if(null != parent){ + sysMenu.setRedParentName(parent.getName()); + } + } + return sysMenuRDao.insert(sysMenu); + }else { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) + .setErrorDetail("角色代码已存在") + .setErrorSolution("请重新输入角色代码") + .build(); } - return sysMenuRDao.insert(sysMenu); } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java index f4670a2..d87f6bb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java @@ -4,11 +4,14 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; 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.SysMessage; import cn.estsh.i3plus.pojo.platform.bean.SysUser; import cn.estsh.i3plus.pojo.platform.repository.SysMessageRepository; import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository; 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 cn.estsh.impp.framework.boot.util.ValidatorBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -95,4 +98,35 @@ public class SysMessageService implements ISysMessageService { return new ListPager(sysMessageRDao.findByHqlWherePage(hqlPack + sysMessage.orderBy(),pager),pager); } } + + @Override + public void updateSysMessageStatusById(String id, Integer status) { + LOGGER.info("消息 SYS_MESSAGE id:{}，status:{}",id,status); + SysMessage sysMessage = sysMessageRDao.getById(Long.parseLong(id)); + sysMessage.setMessageStatusId(status); + + sysMessageRDao.update(sysMessage); + } + + @Override + public void deleteSysMessageByIds(String[] ids) { + LOGGER.info("硬件类型 TOOL_TYPE ids:{}", ids.toString()); + Long[] array = new Long[ids.length]; + for (int i = 0; i < ids.length; i++) { + array[i] = Long.parseLong(ids[i]); + } + + sysMessageRDao.deleteByIds(array); + } + + @Override + public void updateSysMessageStatusByIds(String[] ids,Integer status) { + LOGGER.info("硬件类型 TOOL_TYPE ids:{}", ids.toString()); + long[] array = new long[ids.length]; + for (int i = 0; i < ids.length; i++) { + array[i] = Long.parseLong(ids[i]); + } + // TODO 批量修改消息状态 +// sysMessageRDao. + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java new file mode 100644 index 0000000..370b6bc --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java @@ -0,0 +1,197 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService; +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.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.RefRoleMenu; +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 cn.estsh.i3plus.pojo.platform.repository.RefRoleMenuRepository; +import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository; +import cn.estsh.i3plus.pojo.platform.repository.SysRoleRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : 系统角色业务接口实现 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 16:58:43.779 + * @Modify : + **/ +@Service +public class SysRoleService implements ISysRoleService { + + public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleService.class); + + @Autowired + private SysRoleRepository sysRoleRDao; + + @Autowired + private SysMenuRepository sysMenuRDao; + + @Autowired + private RefRoleMenuRepository refRoleMenuRDao; + + @Override + public void updateSysRole(SysRole sysRole) { + LOGGER.info("系统角色 SYS_ROLE :{}", sysRole); + sysRoleRDao.update(sysRole); + } + + @Override + public void updateSysRoleStatus(String id, int status, SessionUser user) { + LOGGER.info("系统角色 SYS_MENU id:{} status:{} user:{}", id,status,user); + SysRole role = sysRoleRDao.getById(Long.parseLong(id)); + role.setRoleStatusId(status); + role.setModifyUser(user.getUserName()); + sysRoleRDao.update(role); + } + + @Override + public void updateSysRoleStatusByIds(String[] ids, int status, SessionUser user) { + LOGGER.info("系统功能 SYS_MENU ids:{} status:{} user:{}", ids, status, user); + StringBuffer where = new StringBuffer(); + + HqlPack.getInPack(String.join(",", ids), "id", where); + sysRoleRDao.updateByHqlWhere(where.toString(), "roleStatusId", status); + } + + @Override + public void deleteSysRoleById(String id) { + LOGGER.info("系统角色 SYS_ROLE Key:{}", id); + sysRoleRDao.deleteById(Long.parseLong(id)); + } + + + @Override + public SysRole insertSysRole(SysRole sysRole) { + LOGGER.info("系统角色 SYS_ROLE :{}", sysRole); + return sysRoleRDao.insert(sysRole); + } + + @Override + public void refreshSysRoleRef(String roleId,String[] ids,SessionUser user) { + LOGGER.info("系统角色 SYS_ROLE :{}", roleId); + LOGGER.info("系统角色 List :{}", ids); + + refreshBatchSysRoleRef(new String[]{roleId}, ids, user); + } + + @Override + public void refreshBatchSysRoleRef(String[] roleIds, String[] ids,SessionUser user) { + LOGGER.info("系统角色 String[] :{}", roleIds); + LOGGER.info("系统角色 List :{}", ids); + + String roleWhere = CoreHqlPack.packHqlIds("id", roleIds); + List roleList = sysRoleRDao.findByHqlWhere(roleWhere); + + if(roleList != null && roleList.size() > 0){ + List moduleListRdd = new ArrayList<>(); + List featuresListRdd = new ArrayList<>(); // 冗余 + List refs = new ArrayList<>(); // 角色权限关系 + + // 封装需要删除的IDS + Long[] rids = new Long[roleList.size()]; + for (int i = 0; i < roleList.size(); i++) { + rids[i] = roleList.get(i).getId(); + } + // 删除角色权限关系 + String deleteWhere = CoreHqlPack.packHqlIds("roleId", roleIds); + List refRoleMenuList = refRoleMenuRDao.findByHqlWhere(deleteWhere); + refRoleMenuRDao.deleteAll(refRoleMenuList); + + if(ids != null && ids.length > 0){ + String menuWhere = CoreHqlPack.packHqlIds("id", ids); + List list = sysMenuRDao.findByHqlWhere(menuWhere); + + // 插入角色权限关系 + if(list != null && list.size() > 0){ + for (SysMenu menu : list) { + for (SysRole role : roleList) { + RefRoleMenu ref = new RefRoleMenu(menu.getId(), menu.getName(), role.getId(), role.getName()); + ConvertBean.modelInitialize(ref, user); + refs.add(ref); + } + + // 冗余信息封装 + if(CommonEnumUtil.METHOD_LEVEL.MODULE.getValue() == menu.getMenuTypeId().intValue()){ + moduleListRdd.add(menu.getName()); + } + if(CommonEnumUtil.METHOD_LEVEL.BUTTON.getValue() == menu.getMenuTypeId().intValue()){ + featuresListRdd.add(menu.getName()); + } + } + } + } + + // 冗余信息 + for (SysRole role : roleList) { + role.setRedModuleNumber(moduleListRdd.size()); + role.setRedModuleNames(String.join(",",moduleListRdd)); + + role.setRedMenuNumber(featuresListRdd.size()); + role.setRedMenuNames(String.join(",",featuresListRdd)); + } + + refRoleMenuRDao.saveAll(refs); + sysRoleRDao.saveAll(roleList); + }else { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setErrorDetail("角色信息不存在") + .setErrorSolution("请重新输入") + .build(); + } + } + + @Override + public List findRefRoleMenuByRoleId(String roleId) { + LOGGER.info("系统角色权限关系 RefRoleMenu find By RoleId"); + return refRoleMenuRDao.findByProperty("roleId",Long.parseLong(roleId)); + } + + @Override + public List findSysRoleAll() { + LOGGER.info("系统角色 SYS_ROLE find All"); + return sysRoleRDao.findAll(); + } + + @Override + public SysRole getSysRoleById(String id) { + 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/SysRoleServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java deleted file mode 100644 index 585ede8..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java +++ /dev/null @@ -1,102 +0,0 @@ -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.base.tool.HqlPack; -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; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Description : 系统角色业务接口实现 - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 16:58:43.779 - * @Modify : - **/ -@Service -public class SysRoleServiceImpl implements ISysRoleService { - - public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleServiceImpl.class); - - @Autowired - private SysRoleRepository sysRoleRDao; - - @Override - public void updateSysRole(SysRole sysRole) { - LOGGER.info("系统角色 SYS_ROLE :{}", sysRole); - sysRoleRDao.update(sysRole); - } - - @Override - public void updateSysRoleStatus(String id, int status, SessionUser user) { - LOGGER.info("系统角色 SYS_MENU id:{} status:{} user:{}", id,status,user); - SysRole role = sysRoleRDao.getById(Long.parseLong(id)); - role.setRoleStatusId(status); - role.setModifyUser(user.getUserName()); - sysRoleRDao.update(role); - } - - @Override - public void updateSysRoleStatusByIds(String[] ids, int status, SessionUser user) { - LOGGER.info("系统功能 SYS_MENU ids:{} status:{} user:{}", ids, status, user); - StringBuffer where = new StringBuffer(); - - HqlPack.getInPack(String.join(",", ids), "id", where); - sysRoleRDao.updateByHqlWhere(where.toString(), "roleStatusId", status); - } - - @Override - public void deleteSysRoleById(String id) { - LOGGER.info("系统角色 SYS_ROLE Key:{}", id); - sysRoleRDao.deleteById(Long.parseLong(id)); - } - - - @Override - public SysRole insertSysRole(SysRole sysRole) { - LOGGER.info("系统角色 SYS_ROLE :{}", sysRole); - return sysRoleRDao.insert(sysRole); - } - - @Override - public List findSysRoleAll() { - LOGGER.info("系统角色 SYS_ROLE find All"); - return sysRoleRDao.findAll(); - } - - @Override - public SysRole getSysRoleById(String id) { - 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/SysUserService.java similarity index 86% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 7e29b7a..600d482 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/SysUserService.java @@ -1,8 +1,12 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; -import cn.estsh.i3plus.core.api.iservice.base.ISysUserService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.EncryptTool; +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.shirotoken.AdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken; @@ -31,9 +35,9 @@ import java.util.List; * @Modify : **/ @Service -public class SysUserServiceImpl implements ISysUserService { +public class SysUserService implements ISysUserService { - public static final Logger LOGGER = LoggerFactory.getLogger(SysUserServiceImpl.class); + public static final Logger LOGGER = LoggerFactory.getLogger(SysUserService.class); @Autowired private SysUserRepository sysUserRDao; @@ -100,7 +104,6 @@ public class SysUserServiceImpl implements ISysUserService { return sessionUser; } - @Override public void updateSysUserStatus(String id, int status, SessionUser user) { LOGGER.info("平台用户 SYS_USER id:{} status:{} modifyUser:{}", id, status, user.getUserName()); @@ -111,6 +114,23 @@ public class SysUserServiceImpl implements ISysUserService { } @Override + public void updateBatchSysUserStatus(String[] ids, int status, SessionUser user) { + LOGGER.info("平台用户 SYS_USER DELETE By ids :{} status:{}, SessionUser :{}", ids,status,user); + + // 标记用户已删除 + String where = CoreHqlPack.packHqlIds("id", ids); + List list = sysUserRDao.findByHqlWhere(where); + if(null != list && list.size() > 0){ + for (SysUser sysUser : list) { + sysUser.setUserStatusId(status); + sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + ConvertBean.modelUpdate(sysUser,user); + } + sysUserRDao.saveAll(list); + } + } + + @Override public void updateSysUser(SysUser sysUser) throws Exception{ LOGGER.info("平台用户 SYS_USER SysUser :{}", sysUser); @@ -157,7 +177,7 @@ public class SysUserServiceImpl implements ISysUserService { return user; } else { throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) .setErrorDetail("用户名已存在") .setErrorSolution("请重新输入用户名") @@ -259,12 +279,38 @@ public class SysUserServiceImpl implements ISysUserService { } @Override + public void deleteBatchSysUserById(String[] ids,SessionUser user) { + LOGGER.info("平台用户 SYS_USER DELETE By ids :{}", ids); + + // 标记用户已删除 + String where = CoreHqlPack.packHqlIds("id", ids); + List list = sysUserRDao.findByHqlWhere(where); + if(null != list && list.size() > 0){ + for (SysUser sysUser : list) { + sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + ConvertBean.modelUpdate(sysUser,user); + } + sysUserRDao.saveAll(list); + } + } + + @Override public List list() { LOGGER.info("平台用户 SYS_USER find All"); return sysUserRDao.findByProperty("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); } @Override + public ListPager querySysUserByPager(SysUser user, Pager pager) { + LOGGER.info("系统用户 SysUser find user :{} page :{}", user, pager); + + //生成hql查询语句 + String hqlPack = CoreHqlPack.packHqlSysUser(user); + pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(sysUserRDao.findByHqlWherePage(hqlPack + user.orderBy(), pager), pager); + } + + @Override public SysUser getSysUserById(String id) { LOGGER.info("平台用户 SYS_USER get By id :{}", id); return sysUserRDao.getById(Long.parseLong(id)); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeExpressionServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeExpressionServiceImpl.java index 3894475..4c40ebe 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeExpressionServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeExpressionServiceImpl.java @@ -1,8 +1,12 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService; +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.platform.bean.TaskTimeExpression; import cn.estsh.i3plus.pojo.platform.repository.TaskTimeExpressionRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -44,9 +48,9 @@ public class TaskTimeExpressionServiceImpl implements ITaskTimeExpressionService } @Override - public List findTaskTimeExpressionAll() { - LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION find All"); - return taskTimeRecordingRDao.findAll(); + public List listTaskTimeExpression() { + LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION list"); + return taskTimeRecordingRDao.list(); } @Override @@ -54,4 +58,17 @@ public class TaskTimeExpressionServiceImpl implements ITaskTimeExpressionService LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION :{}" ,id); return taskTimeRecordingRDao.getById(Long.parseLong(id)); } + + @Override + public ListPager queryTaskTimeExpressionByPager(TaskTimeExpression taskTimeExpression, Pager pager) { + LOGGER.info("文件表达式 TaskTimeExpression taskTimeExpression:{}，Pager:{}",taskTimeExpression,pager); + if(taskTimeExpression == null) { + pager = PagerHelper.getPager(pager, taskTimeRecordingRDao.listCount()); + return new ListPager(taskTimeRecordingRDao.listPager(pager),pager); + }else { + String hqlPack = CoreHqlPack.packHqlTaskTimeExpression(taskTimeExpression); + pager = PagerHelper.getPager(pager, taskTimeRecordingRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(taskTimeRecordingRDao.findByHqlWherePage(hqlPack + taskTimeExpression.orderBy(),pager),pager); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeServiceImpl.java index 004298d..7a6233a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeServiceImpl.java @@ -1,11 +1,15 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeService; +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.SysMenu; import cn.estsh.i3plus.pojo.platform.bean.TaskTime; import cn.estsh.i3plus.pojo.platform.repository.TaskTimeRepository; +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; @@ -32,7 +36,7 @@ public class TaskTimeServiceImpl implements ITaskTimeService { @Override public void updateTaskTime(TaskTime taskTime) { - LOGGER.info("定时任务 TASK_TIMED :{}", taskTime); + LOGGER.info("定时任务 TASK_TIME :{}", taskTime); taskTimeRDao.update(taskTime); } @@ -47,25 +51,38 @@ public class TaskTimeServiceImpl implements ITaskTimeService { @Override public void deleteTaskTimeById(String id) { - LOGGER.info("定时任务 TASK_TIMED Key:{}", id); + LOGGER.info("定时任务 TASK_TIME Key:{}", id); taskTimeRDao.deleteById(Long.parseLong(id)); } @Override public TaskTime insertTaskTime(TaskTime taskTime) { - LOGGER.info("定时任务 TASK_TIMED :{}", taskTime); + LOGGER.info("定时任务 TASK_TIME :{}", taskTime); return taskTimeRDao.insert(taskTime); } @Override public List listTaskTime() { - LOGGER.info("定时任务 TASK_TIMED find All"); + LOGGER.info("定时任务 TASK_TIME find All"); return taskTimeRDao.findAll(); } @Override public TaskTime getTaskTimeById(String id) { - LOGGER.info("定时任务 TASK_TIMED find id:{}", id); + LOGGER.info("定时任务 TASK_TIME find id:{}", id); return taskTimeRDao.getOne(Long.parseLong(id)); } + + @Override + public ListPager queryTaskTimeByPager(TaskTime taskTime, Pager pager) { + LOGGER.info("定时任务 TASK_TIME TaskTime:{}，Pager:{}",taskTime,pager); + if(taskTime == null) { + pager = PagerHelper.getPager(pager, taskTimeRDao.listCount()); + return new ListPager(taskTimeRDao.listPager(pager),pager); + }else { + String hqlPack = CoreHqlPack.packHqlTaskTime(taskTime); + pager = PagerHelper.getPager(pager, taskTimeRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(taskTimeRDao.findByHqlWherePage(hqlPack + taskTime.orderBy(),pager),pager); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeService.java index 218f3f6..093738c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeService.java @@ -100,7 +100,7 @@ public class ToolTypeService implements IToolTypeService { .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/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysFileService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysFileService.java new file mode 100644 index 0000000..0ca88b3 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysFileService.java @@ -0,0 +1,109 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; +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.platform.bean.SysFile; +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 : yunhao + * @Date : 2018-10-31 15:30 + * @Modify : + **/ +public class TestSysFileService extends TestBase { + + @Autowired + ISysFileService sysFileService; + + /** + * 测试 查询所有文件资源 + */ + @Test + @Transactional + public void testListSysFile() { + List list = sysFileService.listSysFile(); + System.out.println(JSON.toJSONString(list)); + } + + /** + * 测试 根据id查询文件资源 + */ + @Test + @Transactional + public void testGetSysFileById() { + SysFile sysFile = sysFileService.getSysFileById("1057110061127700480"); + System.out.println(JSON.toJSONString(sysFile)); + } + + /** + * 测试 添加文件资源 + */ + @Test + @Transactional + @Rollback(false) + public void testInsertSysFile() { + SysFile sysFile = new SysFile(); + sysFile.setName("文件doc"); + sysFile.setFileTypeId(1058251784058966016L); + sysFile.setFileTypeName("doc"); + sysFile.setDownloads(999); + sysFile.setFileSize(1024); + sysFile.setCreateUser("中国移动"); + sysFile.setCreateDatetime("2018-01-01 00:00:00"); + for (int i = 0; i < 50; i++) { + sysFile.setId(null); + sysFile.setName("文件"+ i +".doc"); + sysFile.setCreateDatetime("2018-01-01 " + (i % 10) + "0:00:00"); + sysFileService.insertSysFile(sysFile); + } + System.out.println(JSON.toJSONString(sysFile)); + } + + /** + * 测试 修改文件资源 + */ + @Test + @Transactional + public void testUpdateSysFile(){ + SysFile sysFile = sysFileService.getSysFileById("1057110613261684736"); + sysFile.setName("测试修改"); + + sysFileService.updateSysFile(sysFile); + } + + /** + * 测试 根据id删除文件资源 + */ + @Test + @Transactional + public void testDeleteSysFileById(){ + sysFileService.deleteSysFileById("1057111616417566720"); + } + + /** + * 测试 复杂查询 + */ + @Test + @Transactional + public void testQuerySysFileByPager(){ + SysFile sysFile = new SysFile(); + + Pager pager = new Pager(); + pager.setPageSize(10); + pager.setCurrentPage(5); + + ListPager list = sysFileService.querySysFileByPager(sysFile,pager); + System.out.println(list); + } +} diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java new file mode 100644 index 0000000..1da712a --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java @@ -0,0 +1,104 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService; +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.platform.bean.TaskTimeExpression; +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 : yunhao + * @Date : 2018-10-31 15:30 + * @Modify : + **/ +public class TestTaskTimeExpressionService extends TestBase { + + @Autowired + ITaskTimeExpressionService taskTimeExpressionService; + + /** + * 测试 查询所有时间表达式 + */ + @Test + @Transactional + public void testListTaskTimeExpression() { + List list = taskTimeExpressionService.listTaskTimeExpression(); + System.out.println(JSON.toJSONString(list)); + } + + /** + * 测试 根据id查询时间表达式 + */ + @Test + @Transactional + public void testGetTaskTimeExpressionById() { + TaskTimeExpression taskTimeExpression = taskTimeExpressionService.getTaskTimeExpressionById("1057110061127700480"); + System.out.println(JSON.toJSONString(taskTimeExpression)); + } + + /** + * 测试 添加时间表达式 + */ + @Test + @Transactional + @Rollback(false) + public void testInsertTaskTimeExpression() { + TaskTimeExpression taskTimeExpression = new TaskTimeExpression(); + taskTimeExpression.setName("表达式"); + taskTimeExpression.setTimeExpression("0000000"); + taskTimeExpression.setTimeDescription("描述"); + + for (int i = 0; i < 50; i++) { + taskTimeExpression.setId(null); + taskTimeExpression.setName("表达式"+i); + taskTimeExpressionService.insertTaskTimeExpression(taskTimeExpression); + } + System.out.println(JSON.toJSONString(taskTimeExpression)); + } + + /** + * 测试 修改时间表达式 + */ + @Test + @Transactional + public void testUpdateTaskTimeExpression(){ + TaskTimeExpression taskTimeExpression = taskTimeExpressionService.getTaskTimeExpressionById("1057110613261684736"); + taskTimeExpression.setName("测试修改"); + + taskTimeExpressionService.updateTaskTimeExpression(taskTimeExpression); + } + + /** + * 测试 根据id删除时间表达式 + */ + @Test + @Transactional + public void testDeleteTaskTimeExpressionById(){ + taskTimeExpressionService.deleteTaskTimeExpressionById("1057111616417566720"); + } + + /** + * 测试 复杂查询 + */ + @Test + @Transactional + public void testQueryTaskTimeExpressionByPager(){ + TaskTimeExpression taskTimeExpression = new TaskTimeExpression(); + + Pager pager = new Pager(); + pager.setPageSize(10); + pager.setCurrentPage(5); + + ListPager list = taskTimeExpressionService.queryTaskTimeExpressionByPager(taskTimeExpression,pager); + System.out.println(list); + } +} diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeService.java new file mode 100644 index 0000000..0519faa --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeService.java @@ -0,0 +1,109 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeService; +import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeService; +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.platform.bean.TaskTime; +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 : yunhao + * @Date : 2018-11-03 00:09 + * @Modify : + **/ +public class TestTaskTimeService extends TestBase { + + @Autowired + ITaskTimeService taskTimeService; + + /** + * 测试 查询所有硬件 + */ + @Test + @Transactional + public void testListTaskTime() { + List list = taskTimeService.listTaskTime(); + System.out.println(JSON.toJSONString(list)); + } + + /** + * 测试 根据id查询硬件 + */ + @Test + @Transactional + public void testGetTaskTimeById() { + TaskTime taskTime = taskTimeService.getTaskTimeById("1057110061127700480"); + System.out.println(JSON.toJSONString(taskTime)); + } + + /** + * 测试 添加硬件 + */ + @Test + @Transactional + @Rollback(false) + public void testInsertTaskTime() { + TaskTime taskTime = new TaskTime(); + taskTime.setName("时间表达式"); + taskTime.setTaskStartDateTime("2018-01-01 00:00:00"); + taskTime.setTaskEndDateTime("2018-12-31 00:00:00"); + taskTime.setLastRunDateTime("2018-11-03 00:00:00"); + taskTime.setTaskTypeId(ImppEnumUtil.TASK_METHOD_TYPE.TYPE_GROUP.getValue()); + taskTime.setTaskStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); + + for (int i = 0; i < 50; i++) { + taskTime.setId(null); + taskTime.setName("时间表达式"+i); + taskTimeService.insertTaskTime(taskTime); + } + System.out.println(JSON.toJSONString(taskTime)); + } + + /** + * 测试 修改硬件 + */ + @Test + @Transactional + public void testUpdateTaskTime(){ + TaskTime taskTime = taskTimeService.getTaskTimeById("1057110613261684736"); + taskTime.setName("测试修改"); + + taskTimeService.updateTaskTime(taskTime); + } + + /** + * 测试 根据id删除硬件 + */ + @Test + @Transactional + public void testDeleteTaskTimeById(){ + taskTimeService.deleteTaskTimeById("1057111616417566720"); + } + + /** + * 测试 复杂查询 + */ + @Test + @Transactional + public void testQueryTaskTimeByPager(){ + TaskTime taskTime = new TaskTime(); + + Pager pager = new Pager(); + pager.setPageSize(10); + pager.setCurrentPage(5); + + ListPager list = taskTimeService.queryTaskTimeByPager(taskTime,pager); + System.out.println(list); + } +}