diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java index 724b230..9b56949 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java @@ -38,6 +38,12 @@ public interface ICoreTreeService { void findPositionChildrenTreePack(Position parent,int step); /** + * 检查父节点是否是子节点ID或者为当前节点ID + * @param position + */ + void doValidatorPositionParentId(Position position) ; + + /** * 获取部门树 * @param parentId * @return @@ -59,6 +65,12 @@ public interface ICoreTreeService { void findDepartmentChildrenTreePack(Department parent,int step); /** + * 检查父节点是否是子节点ID或者为当前节点ID + * @param department + */ + void doValidatorDepartmentParentId(Department department) ; + + /** * 获取组织树 * @param parentId * @return @@ -80,6 +92,12 @@ public interface ICoreTreeService { void findOrganizeChildrenTreePack(Organize parent,int step); /** + * 检查父节点是否是子节点ID或者为当前节点ID + * @param organize + */ + void doValidatorOrganizeParentId(Organize organize) ; + + /** * 获取组织树 * @param parentId * @return @@ -100,4 +118,10 @@ public interface ICoreTreeService { */ void findSysMenuChildrenTreePack(SysMenu parent, int step); + /** + * 检查父节点是否是子节点ID或者为当前节点ID + * @param menu + */ + void doValidatorSysMenuParentId(SysMenu menu) ; + } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java index 1305ec5..cc210a0 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java @@ -55,11 +55,18 @@ public interface ISysDictionaryService { /** * 字典复杂查询，分页，排序 + * 默认查询非顶级字典 */ ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager); /** - * 字典复杂查询，分页，排序 + * 查询顶级字典 */ List findSysDictionaryByTop(); + + /** + * 批量删除字典 + * @param ids + */ + void deleteSysDictionaryByIds(String[] ids); } 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 7232b7d..e25b04d 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 @@ -53,4 +53,10 @@ public interface ISysFileService { * @return */ ListPager querySysFileByPager(SysFile sysFile, Pager pager); + + /** + * 批量删除文件资源 + * @param ids + */ + void deleteSysFileByIds(String[] ids); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java index 2337d42..d592364 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java @@ -50,6 +50,13 @@ public interface ISysMenuService { void deleteSysMenuById(String id); /** + * 根据id批量删除 + * @param ids id数组 + * @return + */ + void deleteSysMenuByIds(String[] ids); + + /** * 新增数据 * * @param sysMenu 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 c5e33b3..e6efca8 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 @@ -67,7 +67,6 @@ public interface ISysMessageService { */ void deleteSysMessageByIds(String[] ids); - /** * 批量修改消息状态 * @param ids 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 441b06d..083d898 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 @@ -50,6 +50,13 @@ public interface ISysRoleService { void deleteSysRoleById(String id); /** + * 根据id批量删除 + * @param ids id数组 + * @return + */ + void deleteSysRoleByIds(String[] ids); + + /** * 新增数据 * * @param sysRole 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 4df32a6..a28f43b 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 @@ -57,4 +57,10 @@ public interface ITaskTimeExpressionService { * @return */ ListPager queryTaskTimeExpressionByPager(TaskTimeExpression taskTimeExpression, Pager pager); + + /** + * 任务表达式批量删除 + * @param ids + */ + void deleteTaskTimeExpressionByIds(String[] ids); } 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 3d788d6..67844e6 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 @@ -4,12 +4,11 @@ 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; /** - * @Description : 定时任务业务接口 + * @Description : 定时任务业务接口 * @Reference : * @Author : wei.peng * @Date : 2018-10-22 16:58:43.968 @@ -64,4 +63,17 @@ public interface ITaskTimeService { * @return */ ListPager queryTaskTimeByPager(TaskTime taskTime, Pager pager); + + /** + * 根据id批量删除定时任务 + * @param ids + */ + void deleteTaskTimeByIds(String[] ids); + + /** + * 批量修改定时任务状态 + * @param ids + * + */ + void updateTaskTimeStatusByIds(String[] ids, Integer status); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolService.java index 2a9cc93..fa7d628 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolService.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.Tool; import cn.estsh.i3plus.pojo.platform.bean.ToolType; -import io.swagger.annotations.ApiOperation; import java.util.List; @@ -21,8 +20,7 @@ public interface IToolService { * 添加硬件 * @param tool */ - @ApiOperation(value="新增工具") - void insertTool(Tool tool); + Tool insertTool(Tool tool); /** * 删除硬件 @@ -58,14 +56,23 @@ public interface IToolService { ListPager queryToolByPager(Tool tool, Pager pager); /** - * 根据id启用硬件 + * 根据id修改硬件状态 * @param id + * @param status */ - void updateStatusEnable(String id); + void updateToolStatusById(String id,Integer status); /** - * 根据id禁用硬件 - * @param id + * 批量删除硬件 + * @param ids + */ + void deleteToolByIds(String[] ids); + + + /** + * 批量修改硬件状态 + * @param ids + * @param status */ - void updateStatusDisable(String id); + void updateToolStatusByIds(String[] ids,Integer status); } 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 dc945d2..93f6d4d 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 @@ -177,6 +177,7 @@ public class DepartmentController { @ApiOperation(value = "根据id批量删除", notes = "根据id批量删除") public ResultBean deleteDepartmentByIds(String[] ids){ try{ + ids = ConvertBean.modelSafeArrayNumber(ids,true); if(ids.length == 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) 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 7ffbaea..89c9cf5 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 @@ -46,6 +46,7 @@ public class OrganizeController { //条件验证 ValidatorBean.beginValid(organize) .notNull("name", organize.getName()) + .notNull("organizeCode", organize.getOrganizeCode()) .notNull("organizeTypeId", organize.getOrganizeTypeId()); //新增初始化 @@ -72,6 +73,7 @@ public class OrganizeController { ValidatorBean.beginValid(organize) .notNull("id", organize.getId()) .notNull("name", organize.getName()) + .notNull("organizeCode", organize.getOrganizeCode()) .notNull("organizeTypeId", organize.getOrganizeTypeId()); ConvertBean.modelUpdate(organize, AuthUtil.getSessionUser()); @@ -185,6 +187,7 @@ public class OrganizeController { @ApiOperation(value = "根据id批量删除", notes = "根据id批量删除") public ResultBean deleteOrganizeByIds(String[] ids){ try{ + ids = ConvertBean.modelSafeArrayNumber(ids,true); if(ids.length == 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java index a0fd8c3..70ac0ab 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 @@ -56,8 +56,9 @@ public class PositionController { position.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); } - positionService.insertPosition(position); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + Position pos = positionService.insertPosition(position); + return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(pos); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); return ResultBean.fail(busExcep.getErrorShow()); @@ -77,7 +78,7 @@ public class PositionController { //条件验证 ValidatorBean.beginValid(position) .notNull("id",position.getId()) - .notNull("positionName",position.getName()) + .notNull("name",position.getName()) .notNull("positionCode",position.getPositionCode()); //修改初始化 @@ -173,6 +174,7 @@ public class PositionController { @ApiOperation(value = "根据id批量删除", notes = "根据id批量删除") public ResultBean deletePositionByIds(String[] ids){ try{ + ids = ConvertBean.modelSafeArrayNumber(ids,true); if(ids.length == 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index 67405bd..b30b78e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -4,11 +4,13 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; 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.SysDictionary; 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; @@ -116,8 +118,7 @@ public class SysDictionaryController { public ResultBean findSysDictionaryAll() { try { List sysDictionaryList = sysDictionaryService.listSysDictionary(); - return ResultBean.success("查询成功") - .setResultList(sysDictionaryList) + return ResultBean.success("查询成功").setResultList(sysDictionaryList) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); @@ -137,8 +138,7 @@ public class SysDictionaryController { SysDictionary sysDictionary = sysDictionaryService.getSysDictionaryById(id); if (sysDictionary != null) { - return ResultBean.success("查询成功").setResultObject(sysDictionary) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("查询成功").setResultObject(sysDictionary).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("字典不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -174,9 +174,7 @@ public class SysDictionaryController { public ResultBean querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) { try { ListPager sysDictionaryListPager = sysDictionaryService.querySysDictionaryByPager(sysDictionary,pager); - return ResultBean.success("查询成功") - .setListPager(sysDictionaryListPager) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("查询成功").setListPager(sysDictionaryListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep.getErrorShow()); @@ -202,4 +200,26 @@ public class SysDictionaryController { return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + @DeleteMapping("/batch-delete") + @ApiOperation(value = "批量删除消息",notes = "批量删除消息") + public ResultBean deleteSysDictionaryByIds(String[] ids){ + try{ + if(ids.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + sysDictionaryService.deleteSysDictionaryByIds(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()); + } + } } 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 ce8c5cf..fb28157 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 @@ -4,12 +4,14 @@ 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.CommonEnumUtil; 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.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; @@ -147,4 +149,27 @@ public class SysFileController { return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + @DeleteMapping(value = "/batch-delete") + @ApiOperation(value = "批量删除文件资源",notes = "批量删除文件资源") + public ResultBean deleteSysFileByIds(String[] ids){ + try{ + if(ids.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + + sysFileService.deleteSysFileByIds(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()); + } + } } \ 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 92a42be..64dc0f7 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 @@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysMenu; 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; @@ -126,7 +127,7 @@ public class SysMenuController { @GetMapping(value="/query") @ApiOperation(value="查询权限",notes="组合查询权限，外带分页功能") - public ResultBean queryPosition(SysMenu menu, Pager pager){ + public ResultBean querySysMenu(SysMenu menu, Pager pager){ try{ ListPager listPager = sysMenuService.querySysMenu(menu, pager); @@ -187,6 +188,7 @@ public class SysMenuController { public ResultBean updateBatchStatus(String[] ids,int status) { try { // 数据校验 + ids = ConvertBean.modelSafeArrayNumber(ids,true); ValidatorBean.checkNotNull(ids, "功能id 不能为空"); ValidatorBean.checkNotZero(status, "功能状态不能为空"); @@ -202,7 +204,28 @@ public class SysMenuController { } } - - + @DeleteMapping(value = "/batch-delete") + @ApiOperation(value = "根据id批量删除", notes = "根据id批量删除") + public ResultBean deleteSysMenuByIds(String[] ids){ + try{ + ids = ConvertBean.modelSafeArrayNumber(ids,true); + if(ids.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + sysMenuService.deleteSysMenuByIds(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()); + } + } } 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 9dba1bb..a58ed30 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 @@ -56,8 +56,8 @@ public class SysMessageController { // 添加初始化 ConvertBean.modelInitialize(sysMessage,user); - sysMessage.setMessageSendId(user.getUser().getId()); - sysMessage.setRedSendName(user.getUser().getName()); +// sysMessage.setMessageSendId(user.getUser().getId()); +// sysMessage.setRedSendName(user.getUser().getName()); sysMessage.setMessageStatusId(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue()); sysMessageService.insertSysMessage(sysMessage); @@ -133,11 +133,15 @@ public class SysMessageController { } @GetMapping(value = "/get/{id}") - @ApiOperation(value = "根据id查询系统参数",notes = "根据id查询系统参数") + @ApiOperation(value = "根据id查询消息",notes = "根据id查询消息") public ResultBean getSysConfigById(String id){ try { SysMessage sysMessageList = sysMessageService.getSysMessageById(id); - return ResultBean.success("查询成功").setResultObject(sysMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + if (sysMessageList != null) { + return ResultBean.success("查询成功").setResultObject(sysMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }else { + return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); + } }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep.getErrorShow()); @@ -202,9 +206,9 @@ public class SysMessageController { } } - @DeleteMapping("/batch-status") + @PutMapping("/batch-status") @ApiOperation(value = "批量切换消息状态",notes = "批量切换消息状态") - public ResultBean deleteSysMessageByIds(String[] ids,Integer status){ + public ResultBean updateSysMessageStatusByIds(String[] ids,Integer status){ try{ if(ids.length == 0){ throw ImppExceptionBuilder.newInstance() 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 41a619b..e0e4399 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 @@ -243,11 +243,12 @@ public class SysRoleController { @ApiOperation(value = "批量新增角色权限关系", notes = "批量新增角色权限关系") public ResultBean insertBatchRefMenu(String[] roleIds,String[] menuIds) { try { + roleIds = ConvertBean.modelSafeArrayNumber(roleIds,true); + menuIds = ConvertBean.modelSafeArrayNumber(menuIds,true); + // 数据校验 ValidatorBean.checkNotNull(roleIds, "角色roleIds 不能为空"); - roleIds = ConvertBean.modelSafeArrayNumber(roleIds,true); - if(roleIds.length == 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) @@ -267,4 +268,28 @@ public class SysRoleController { return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()); } } + + @DeleteMapping(value = "/batch-delete") + @ApiOperation(value = "根据id批量删除", notes = "根据id批量删除") + public ResultBean deleteSysRoleByIds(String[] ids){ + try{ + ids = ConvertBean.modelSafeArrayNumber(ids,true); + if(ids.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + sysRoleService.deleteSysRoleByIds(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()); + } + } } 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 f28a7f1..566e22f 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 @@ -217,6 +217,7 @@ public class SysUserController { @ApiOperation(value = "根据id批量删除", notes = "根据id批量删除") public ResultBean deleteBatchSysUserByIds(String[] ids){ try{ + ids = ConvertBean.modelSafeArrayNumber(ids,true); if(ids.length == 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) @@ -241,6 +242,8 @@ public class SysUserController { @ApiOperation(value = "批量修改系统功能状态", notes = "根据ID修改系统功能状态") public ResultBean updateBatchStatus(String[] ids,int status) { try { + ids = ConvertBean.modelSafeArrayNumber(ids,true); + // 数据校验 ValidatorBean.checkNotNull(ids, "功能id 不能为空"); ValidatorBean.checkNotZero(status, "功能状态不能为空"); 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 b0b269c..df4212c 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 @@ -5,10 +5,13 @@ 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.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.*; 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; @@ -49,7 +52,8 @@ public class TaskTimeController { ValidatorBean.beginValid(taskTime) .notNull("timeId", taskTime.getTimeId()) .notNull("name", taskTime.getName()) - .notNull("taskDescription", taskTime.getTaskDescription()); + .notNull("timeId",taskTime.getTimeId()) + .notNull("taskMethodTypeId", taskTime.getTaskMethodTypeId()); TaskTimeExpression taskTimeExpression = taskTimeExpressionService.getTaskTimeExpressionById(taskTime.getTimeId().toString()); ValidatorBean.beginValid(taskTimeExpression); @@ -58,9 +62,9 @@ public class TaskTimeController { taskTime.setRedTimeExpression(taskTimeExpression.getTimeExpression()); ConvertBean.modelInitialize(taskTime, AuthUtil.getSessionUser()); + taskTime.setTaskStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); taskTime = taskTimeService.insertTaskTime(taskTime); - return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultObject(taskTime); @@ -82,7 +86,7 @@ public class TaskTimeController { .notNull("id", taskTime.getId()) .notNull("timeId", taskTime.getTimeId()) .notNull("name", taskTime.getName()) - .notNull("taskDescription", taskTime.getTaskDescription()); + .notNull("taskMethodTypeId",taskTime.getTaskMethodTypeId()); TaskTimeExpression taskTimeExpression = taskTimeExpressionService.getTaskTimeExpressionById(taskTime.getTimeId().toString()); @@ -198,4 +202,52 @@ public class TaskTimeController { return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + @DeleteMapping("/batch-delete") + @ApiOperation(value = "根据id批量删除定时任务",notes = "根据id批量删除定时任务") + public ResultBean deleteTaskTimeByIds(String[] ids){ + try{ + if(ids.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + + taskTimeService.deleteTaskTimeByIds(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()); + } + } + + @PutMapping(value = "/batch-status") + @ApiOperation(value = "批量修改系统任务状态",notes = "批量修改系统任务状态") + public ResultBean updateTaskTimeStatusByIds(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(); + } + ValidatorBean.checkNotZero(status,"状态不能为空"); + + taskTimeService.updateTaskTimeStatusByIds(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.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/TaskTimeExpressionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java index 5f04bd2..7419418 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 @@ -4,10 +4,12 @@ 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.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression; 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; @@ -160,4 +162,27 @@ public class TaskTimeExpressionController { return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + @DeleteMapping("/batch-delete") + @ApiOperation(value = "根据id批量删除时间表达式",notes = "根据id批量删除时间表达式") + public ResultBean deleteTaskTimeExpressionByIds(String[] ids){ + try{ + if(ids.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + + taskTimeExpressionService.deleteTaskTimeExpressionByIds(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()); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java index bc84bf6..aac880d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java @@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.Tool; 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; @@ -179,12 +180,11 @@ public class ToolController { } @PutMapping(value = "/status") - @ApiOperation(value = "硬件类型启用",notes = "硬件类型禁用") + @ApiOperation(value = "硬件状态",notes = "硬件类型禁用") public ResultBean updateStatusEnable(String id,Integer status){ try { - toolService.updateStatusEnable(id); - return ResultBean.success("操作成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + toolService.updateToolStatusById(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()); @@ -194,13 +194,41 @@ public class ToolController { } } - @PutMapping(value = "/update/status/disable") - @ApiOperation(value = "硬件类型启用",notes = "硬件类型禁用") - public ResultBean updateStatusDisable(String id){ - try { - toolService.updateStatusDisable(id); - return ResultBean.success("操作成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + @DeleteMapping("/batch-delete") + @ApiOperation(value = "批量删除硬件",notes = "批量删除硬件") + public ResultBean deleteToolByIds(String[] ids){ + try{ + if(ids.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + toolService.deleteToolByIds(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()); + } + } + + @PutMapping("/batch-status") + @ApiOperation(value = "批量切换硬件状态",notes = "批量切换硬件状态") + public ResultBean updateToolStatusByIds(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(); + } + toolService.updateToolStatusByIds(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()); 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 da84501..d56a5b8 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 @@ -174,8 +174,7 @@ public class ToolTypeController { .build(); } toolTypeService.deleteToolTypeByIds(ids); - return ResultBean.success("删除成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep.getErrorShow()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java index f5336aa..b9166c8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java @@ -1,11 +1,14 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.i3plus.pojo.platform.repository.DepartmentRepository; 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.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; @@ -81,6 +84,12 @@ public class CoreTreeService implements ICoreTreeService { } @Override + public void doValidatorPositionParentId(Position position) { + findPositionChildrenTreePack(position,0); + validatorPositionParentId(position.getChildList(),position.getParentId()); + } + + @Override public List findDepartmentTreeByParentId(long parentId) { List result = departmentRDao.findByProperty("parentId", parentId); @@ -123,6 +132,12 @@ public class CoreTreeService implements ICoreTreeService { } @Override + public void doValidatorDepartmentParentId(Department department) { + findDepartmentChildrenTreePack(department,0); + validatorDepartmentParentId(department.getChildList(),department.getParentId()); + } + + @Override public List findOrganizeTreeByParentId(long parentId) { List result = organizeRDao.findByProperty("parentId", parentId); @@ -164,6 +179,12 @@ public class CoreTreeService implements ICoreTreeService { } @Override + public void doValidatorOrganizeParentId(Organize organize) { + findOrganizeChildrenTreePack(organize,0); + validatorOrganizeParentId(organize.getChildList(),organize.getParentId()); + } + + @Override public List findSysMenuTreeByParentId(long parentId) { List result = menuRDao.findByProperty("parentId", parentId); @@ -203,4 +224,82 @@ public class CoreTreeService implements ICoreTreeService { LOGGER.info("【{}】包含子集：{},步长：{}", parent.getName(), childList.size(), step); parent.setChildList(childList); } + + @Override + public void doValidatorSysMenuParentId(SysMenu menu) { + findSysMenuChildrenTreePack(menu,0); + validatorSysMenuParentId(menu.getChildList(),menu.getParentId()); + } + + private void validatorPositionParentId(List list, Long parentId){ + if(list != null && list.size() > 0){ + for (Position position : list) { + // 判断子集的ID 是否是 父节点ID + if(position.getId().equals(parentId) || position.getId().equals(position.getParentId())){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("上级岗位不能为子岗位") + .setErrorSolution("请重新操作") + .build(); + } + + validatorPositionParentId(position.getChildList(),parentId); + } + } + } + + private void validatorDepartmentParentId(List list, Long parentId){ + if(list != null && list.size() > 0){ + for (Department department : list) { + // 判断子集的ID 是否是 父节点ID + if(department.getId().equals(parentId) || department.getId().equals(department.getParentId())){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("上级部门不能为子部门") + .setErrorSolution("请重新操作") + .build(); + } + + validatorDepartmentParentId(department.getChildList(),parentId); + } + } + } + + private void validatorOrganizeParentId(List list, Long parentId){ + if(list != null && list.size() > 0){ + for (Organize organize : list) { + // 判断子集的ID 是否是 父节点ID + if(organize.getId().equals(parentId) || organize.getId().equals(organize.getParentId())){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("上级部门不能为子部门") + .setErrorSolution("请重新操作") + .build(); + } + + validatorOrganizeParentId(organize.getChildList(),parentId); + } + } + } + + private void validatorSysMenuParentId(List list, Long parentId){ + if(list != null && list.size() > 0){ + for (SysMenu menu : list) { + // 判断子集的ID 是否是 父节点ID + if(menu.getId().equals(parentId) || menu.getId().equals(menu.getParentId())){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("上级部门不能为子部门") + .setErrorSolution("请重新操作") + .build(); + } + + validatorSysMenuParentId(menu.getChildList(),parentId); + } + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentService.java index 76ad476..0a008e0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentService.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.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.Department; import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.repository.DepartmentRepository; @@ -37,18 +38,21 @@ public class DepartmentService implements IDepartmentService { @Autowired private OrganizeRepository organizeRDao; + @Autowired + private CoreTreeService coreTreeService; + @Override public Department insertDepartment(Department department) { LOGGER.info("部门信息 Department department:{}", department); // 代码唯一校验 - long count = organizeRDao.findByPropertyCount("departmentCode", department.getDepartmentCode()); + long count = departmentRDao.findByPropertyCount("departmentCode", department.getDepartmentCode()); if(count <= 0){ //冗余父节点信息 - if (department.getParentId() != null && department.getParentId().intValue() > 0) { + if (department.getParentId() != null && department.getParentId() > 0) { LOGGER.info("部门信息 DEPARTMENT :{}", department.getParentId()); Department parentPosition = departmentRDao.getById(department.getParentId()); - ValidatorBean.checkNotNull(parentPosition); + ValidatorBean.checkNotNull(parentPosition,"上级部门信息不存在"); department.setRedParentName(parentPosition.getName()); } @@ -115,7 +119,7 @@ public class DepartmentService implements IDepartmentService { LOGGER.info("部门信息 DEPARTMENT department :{}", department); // 唯一校验 CODE 相同 ID 不同 则视为相同 List list = departmentRDao.findByProperty("departmentCode", department.getDepartmentCode()); - if(null != list && list.size() > 0){ + if(list != null && list.size() > 0){ for (Department dep : list) { if(!dep.getId().equals(department.getId())){ throw ImppExceptionBuilder.newInstance() @@ -128,11 +132,14 @@ public class DepartmentService implements IDepartmentService { } } + // 父节点检查 + coreTreeService.doValidatorDepartmentParentId(department); + // 查询父级部门名称 if (department.getParentId() != null && department.getParentId() > 0) { LOGGER.info("部门信息 DEPARTMENT :{}", department.getParentId()); Department parentPosition = departmentRDao.getById(department.getParentId()); - ValidatorBean.checkNotNull(parentPosition); + ValidatorBean.checkNotNull(parentPosition,"上级部门信息不存在"); department.setRedParentName(parentPosition.getName()); } @@ -147,6 +154,10 @@ public class DepartmentService implements IDepartmentService { // 新增部门 LOGGER.info("部门信息 DEPARTMENT department:{}",department); departmentRDao.update(department); + // 修改冗余信息 + // 修改冗余信息 + departmentRDao.updateByProperties("parentId",department.getId(), + "redParentName",department.getName()); } @Override @@ -190,7 +201,7 @@ public class DepartmentService implements IDepartmentService { String hqlPack = CoreHqlPack.packHqlDepartment(department); pager = PagerHelper.getPager(pager, departmentRDao.findByHqlWhereCount(hqlPack)); return new ListPager(departmentRDao.findByHqlWherePage( - hqlPack + department.getOrderByParam(),pager),pager); + hqlPack + department.orderBy(),pager),pager); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeService.java index 52b2218..c037138 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeService.java @@ -36,6 +36,9 @@ public class OrganizeService implements IOrganizeService { @Autowired private OrganizeRepository organizeRDao; + @Autowired + private CoreTreeService coreTreeService; + @Override public void updateOrganize(Organize organize) { LOGGER.info("组织 ORGANIZE :{}", organize); @@ -54,16 +57,22 @@ public class OrganizeService implements IOrganizeService { } } + // 父节点检查 + coreTreeService.doValidatorOrganizeParentId(organize); + // 冗余父节点 - if(organize.getParentId() != null){ + if(organize.getParentId() != null && organize.getParentId() > 0){ Organize org = getOrganizeById(organize.getParentId().toString()); - ValidatorBean.checkNotNull(org); + ValidatorBean.checkNotNull(org,"上级组织信息不存在"); organize.setRedParentName(org.getName()); } // 更新数据 organizeRDao.update(organize); + // 修改冗余信息 + organizeRDao.updateByProperties("parentId",organize.getId(), + "redParentName",organize.getName()); } @Override @@ -117,9 +126,9 @@ public class OrganizeService implements IOrganizeService { long count = organizeRDao.findByPropertyCount("organizeCode", organize.getOrganizeCode()); if(count <= 0){ // 冗余信息 - if(organize.getParentId() != null && organize.getParentId().intValue() > 0){ + if(organize.getParentId() != null && organize.getParentId() > 0){ Organize org = getOrganizeById(organize.getParentId().toString()); - ValidatorBean.checkNotNull(org); + ValidatorBean.checkNotNull(org,"上级组织信息不存在"); organize.setRedParentName(org.getName()); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionService.java index f3e92b3..bf682c2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionService.java @@ -8,6 +8,7 @@ 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.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; @@ -33,18 +34,24 @@ public class PositionService implements IPositionService { @Autowired private PositionRepository positionRDao; + @Autowired + private CoreTreeService coreTreeService; + + @Autowired + private SysUserRepository sysUserRDao; + @Override public Position insertPosition(Position position) { LOGGER.info("岗位信息 POSITION position:{}", position); // CODE 唯一校验 long count = positionRDao.findByPropertyCount("positionCode", position.getPositionCode()); - if(count > 0){ + 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); + ValidatorBean.checkNotNull(parentPosition,"上级岗位信息不存在"); position.setRedParentName(parentPosition.getName()); } @@ -66,7 +73,7 @@ public class PositionService implements IPositionService { LOGGER.info("岗位信息 POSITION position:{}", position); // 唯一校验 CODE 相同 ID 不同 则视为相同 - List list = positionRDao.findByProperty("organizeCode", position.getPositionCode()); + List list = positionRDao.findByProperty("positionCode", position.getPositionCode()); if(null != list && list.size() > 0){ for (Position pos : list) { if(!pos.getId().equals(position.getId())){ @@ -80,11 +87,14 @@ public class PositionService implements IPositionService { } } + // 父节点检查 + coreTreeService.doValidatorPositionParentId(position); + // 查询父级岗位名称 if (position.getParentId() != null && position.getParentId() > 0) { LOGGER.info("岗位信息 POSITION parentId:{}", position.getParentId()); Position parentPosition = positionRDao.getById(position.getParentId()); - ValidatorBean.checkNotNull(parentPosition); + ValidatorBean.checkNotNull(parentPosition,"上级岗位信息不存在"); position.setRedParentName(parentPosition.getName()); } @@ -92,6 +102,9 @@ public class PositionService implements IPositionService { // 修改岗位信息 LOGGER.info("岗位信息 POSITION position:{}", position); positionRDao.update(position); + // 修改冗余信息 + positionRDao.updateByProperties("parentId",position.getId(), + "redParentName",position.getName()); } @Override @@ -174,7 +187,7 @@ public class PositionService implements IPositionService { } else { String hqlPack = CoreHqlPack.packHqlPosition(position); pager = PagerHelper.getPager(pager, positionRDao.findByHqlWhereCount(hqlPack)); - return new ListPager(positionRDao.findByHqlWherePage(hqlPack + position.getOrderByParam(),pager),pager); + return new ListPager(positionRDao.findByHqlWherePage(hqlPack + position.orderBy(),pager),pager); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java index cf4e900..a8ae70b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java @@ -5,9 +5,12 @@ 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.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository; 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; @@ -32,6 +35,16 @@ public class SysDictionaryService implements ISysDictionaryService { @Override public void insertSysDictionary(SysDictionary sysDictionary) { + long repeatCount = sysDictionaryRDao.findByPropertyCount("dictionaryCode",sysDictionary.getDictionaryCode()); + if (repeatCount > 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) + .setErrorDetail("字典代码已存在") + .setErrorSolution("请重新输入字典代码") + .build(); + } + // 查询父级字典名称 if (sysDictionary.getParentId() != null && sysDictionary.getParentId() > 0) { LOGGER.info("字典 SYS_DICTIONARY parentId:{}", sysDictionary.getParentId()); @@ -41,7 +54,7 @@ public class SysDictionaryService implements ISysDictionaryService { sysDictionary.setRedParentName(parentSysDictionary.getName()); sysDictionary.setRedParentCode(parentSysDictionary.getDictionaryCode()); } else { - sysDictionary.setParentId(-1L); + sysDictionary.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); } LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}",sysDictionary); @@ -56,6 +69,18 @@ public class SysDictionaryService implements ISysDictionaryService { @Override public void updateSysDictionary(SysDictionary sysDictionary) { + // 校验唯一 + String hqlPack = CoreHqlPack.packHqlSysDictionaryCode(sysDictionary); + long repeatCount = sysDictionaryRDao.findByHqlWhereCount(hqlPack); + if (repeatCount > 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) + .setErrorDetail("字典代码已存在") + .setErrorSolution("请重新输入字典代码") + .build(); + } + // 查询父级字典名称 if (sysDictionary.getParentId() != null && sysDictionary.getParentId() > 0) { LOGGER.info("字典 SYS_DICTIONARY parentId:{}", sysDictionary.getParentId()); @@ -64,8 +89,6 @@ public class SysDictionaryService implements ISysDictionaryService { sysDictionary.setRedParentName(parentSysDictionary.getName()); sysDictionary.setRedParentCode(parentSysDictionary.getDictionaryCode()); - } else { - sysDictionary.setParentId(-1L); } LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}",sysDictionary); @@ -81,9 +104,7 @@ public class SysDictionaryService implements ISysDictionaryService { @Override public SysDictionary getSysDictionaryById(String id) { LOGGER.info("字典 SYS_DICTIONARY id:{}",id); - SysDictionary ds = sysDictionaryRDao.getById(Long.parseLong(id)); - System.out.println(ds); - return ds; + return sysDictionaryRDao.getById(Long.parseLong(id)); } @Override @@ -95,14 +116,11 @@ public class SysDictionaryService implements ISysDictionaryService { @Override public ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) { LOGGER.info("字典 SYS_DICTIONARY SysDictionary:{}，Pager:{}",sysDictionary,pager); - if(sysDictionary == null) { - pager = PagerHelper.getPager(pager, sysDictionaryRDao.listCount()); - return new ListPager(sysDictionaryRDao.listPager(pager),pager); - }else { - String hqlPack = CoreHqlPack.packHqlSysDictionary(sysDictionary); - pager = PagerHelper.getPager(pager, sysDictionaryRDao.findByHqlWhereCount(hqlPack)); - return new ListPager(sysDictionaryRDao.findByHqlWherePage(hqlPack + sysDictionary.orderBy(),pager),pager); - } + sysDictionary = sysDictionary == null ? new SysDictionary():sysDictionary; + + String hqlPack = CoreHqlPack.packHqlSysDictionary(sysDictionary); + pager = PagerHelper.getPager(pager, sysDictionaryRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(sysDictionaryRDao.findByHqlWherePage(hqlPack + sysDictionary.orderBy(),pager),pager); } @Override @@ -110,4 +128,15 @@ public class SysDictionaryService implements ISysDictionaryService { LOGGER.info("字典 SYS_DICTIONARY parentId:{}", CommonEnumUtil.PARENT.DEFAULT.getValue()); return sysDictionaryRDao.findByProperty("parentId",(long)CommonEnumUtil.PARENT.DEFAULT.getValue()); } + + @Override + public void deleteSysDictionaryByIds(String[] ids) { + LOGGER.info("字典 SYS_DICTIONARY ids:{}", ids.toString()); + Long[] array = new Long[ids.length]; + for (int i = 0; i < ids.length; i++) { + array[i] = Long.parseLong(ids[i]); + } + + sysDictionaryRDao.deleteByIds(array); + } } 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 2a43a63..7ebb71a 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 @@ -70,4 +70,16 @@ public class SysFileServiceImpl implements ISysFileService { return new ListPager(sysFileRDao.findByHqlWherePage(hqlPack + sysFile.orderBy(),pager),pager); } } + + @Override + public void deleteSysFileByIds(String[] ids) { + LOGGER.info("文件资源 SYS_FILE ids:{}", ids.toString()); + // 转换类型 + Long[] array = new Long[ids.length]; + for (int i = 0; i < ids.length; i++) { + array[i] = Long.parseLong(ids[i]); + } + + sysFileRDao.deleteByIds(array); + } } 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 e0e096e..2fc9087 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,13 +6,14 @@ 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.RefRoleMenuRepository; import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.impp.framework.boot.util.ValidatorBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +36,12 @@ public class SysMenuService implements ISysMenuService { @Autowired private SysMenuRepository sysMenuRDao; + @Autowired + private CoreTreeService coreTreeService; + + @Autowired + private RefRoleMenuRepository refRoleMenuRDao; + @Override public void updateSysMenu(SysMenu sysMenu) { LOGGER.info("系统功能 SYS_MENU :{}", sysMenu); @@ -54,16 +61,36 @@ public class SysMenuService implements ISysMenuService { } } + // 父节点检查 + coreTreeService.doValidatorSysMenuParentId(sysMenu); + + if (sysMenu.getParentId() != null && sysMenu.getParentId() > 0) { + SysMenu parent = sysMenuRDao.getById(sysMenu.getParentId()); + ValidatorBean.checkNotNull(parent,"上级权限信息不存在"); + sysMenu.setRedParentName(parent.getName()); + } + sysMenuRDao.update(sysMenu); + sysMenuRDao.updateByProperties("parentId",sysMenu.getId(), + "redParentName",sysMenu.getName()); } @Override public void updateSysMenuStatus(String id, int status, SessionUser user) { LOGGER.info("系统功能 SYS_MENU id:{} status:{} user:{}", id,status,user); SysMenu menu = sysMenuRDao.getById(Long.parseLong(id)); - menu.setMenuStatus(status); - menu.setModifyUser(user.getUserName()); - sysMenuRDao.update(menu); + if(menu != null){ + menu.setMenuStatus(status); + menu.setModifyUser(user.getUserName()); + sysMenuRDao.update(menu); + }else { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) + .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) + .setErrorDetail("数据不存在") + .setErrorSolution("请重新操作") + .build(); + } } @Override @@ -88,21 +115,44 @@ public class SysMenuService implements ISysMenuService { .build(); } + + refRoleMenuRDao.deleteByProperties("menuId",id); sysMenuRDao.deleteById(Long.parseLong(id)); } @Override + public void deleteSysMenuByIds(String[] ids) { + LOGGER.info("系统功能 SYS_MENU ids :{}", ids); + long positionCount = sysMenuRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); + if (positionCount >= 1) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("存在相关系统功能信息无法删除！") + .setErrorSolution("请先删除子集信息在操作") + .build(); + }else { + Long[] array = new Long[ids.length]; + for (int i = 0; i < ids.length; i++) { + array[i] = Long.parseLong(ids[i]); + } + + refRoleMenuRDao.deleteByTypeLong("menuId",array); + sysMenuRDao.deleteByIds(array); + } + } + + @Override public SysMenu insertSysMenu(SysMenu sysMenu) { LOGGER.info("系统功能 SYS_MENU :{}", sysMenu); // 代码唯一校验 long count = sysMenuRDao.findByPropertyCount("menuCode", sysMenu.getMenuCode()); if(count <= 0){ - if (sysMenu.getParentId() != null && sysMenu.getParentId().intValue() > 0) { + if (sysMenu.getParentId() != null && sysMenu.getParentId() > 0) { SysMenu parent = sysMenuRDao.getById(sysMenu.getParentId()); - if(null != parent){ - sysMenu.setRedParentName(parent.getName()); - } + ValidatorBean.checkNotNull(parent,"上级权限信息不存在"); + sysMenu.setRedParentName(parent.getName()); } return sysMenuRDao.insert(sysMenu); }else { 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 d87f6bb..e55d614 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 @@ -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.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import cn.estsh.i3plus.pojo.platform.bean.SysUser; import cn.estsh.i3plus.pojo.platform.repository.SysMessageRepository; @@ -60,7 +61,7 @@ public class SysMessageService implements ISysMessageService { } @Override - public void updateSysMessage(SysMessage sysMessage) { + public void updateSysMessage(SysMessage sysMessage){ // 查询接收人名称 if (sysMessage.getMessageRecipientId() != null && sysMessage.getMessageRecipientId() > 0) { LOGGER.info("用户信息 SYSUSER id:{}", sysMessage.getMessageRecipientId()); @@ -75,7 +76,7 @@ public class SysMessageService implements ISysMessageService { } @Override - public List listSysMessage() { + public List listSysMessage(){ LOGGER.info("消息 SYS_MESSAGE list"); return sysMessageRDao.list(); } @@ -102,15 +103,12 @@ public class SysMessageService implements ISysMessageService { @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); + sysMessageRDao.updateByProperties("id",Long.parseLong(id),"messageStatusId", status); } @Override public void deleteSysMessageByIds(String[] ids) { - LOGGER.info("硬件类型 TOOL_TYPE ids:{}", ids.toString()); + LOGGER.info("消息 SYS_MESSAGE ids:{}", ids.toString()); Long[] array = new Long[ids.length]; for (int i = 0; i < ids.length; i++) { array[i] = Long.parseLong(ids[i]); @@ -121,12 +119,10 @@ public class SysMessageService implements ISysMessageService { @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. + LOGGER.info("消息 SYS_MESSAGE ids：{}，status：{}",ids,status); + StringBuffer where = new StringBuffer(); + HqlPack.getInPack(String.join(",", ids), "id", where); + + sysMessageRDao.updateByHqlWhere(where.toString(), "messageStatusId", status); } } 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 index 370b6bc..9cf1d59 100644 --- 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 @@ -74,9 +74,30 @@ public class SysRoleService implements ISysRoleService { @Override public void deleteSysRoleById(String id) { LOGGER.info("系统角色 SYS_ROLE Key:{}", id); + refRoleMenuRDao.deleteByProperties("roleId",id); sysRoleRDao.deleteById(Long.parseLong(id)); } + @Override + public void deleteSysRoleByIds(String[] ids) { + LOGGER.info("系统角色 SYS_ROLE ids :{}", ids); + long positionCount = sysRoleRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); + if (positionCount >= 1) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("存在相关系统功能信息无法删除！") + .setErrorSolution("请先删除子集信息在操作") + .build(); + }else { + Long[] array = new Long[ids.length]; + for (int i = 0; i < ids.length; i++) { + array[i] = Long.parseLong(ids[i]); + } + refRoleMenuRDao.deleteByTypeLong("roleId",array); + sysRoleRDao.deleteByIds(array); + } + } @Override public SysRole insertSysRole(SysRole sysRole) { @@ -132,7 +153,7 @@ public class SysRoleService implements ISysRoleService { if(CommonEnumUtil.METHOD_LEVEL.MODULE.getValue() == menu.getMenuTypeId().intValue()){ moduleListRdd.add(menu.getName()); } - if(CommonEnumUtil.METHOD_LEVEL.BUTTON.getValue() == menu.getMenuTypeId().intValue()){ + if(CommonEnumUtil.METHOD_LEVEL.METHOD.getValue() == menu.getMenuTypeId().intValue()){ featuresListRdd.add(menu.getName()); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 600d482..642a428 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -117,13 +117,12 @@ public class SysUserService implements ISysUserService { 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()); + sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); ConvertBean.modelUpdate(sysUser,user); } sysUserRDao.saveAll(list); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java index a6b8787..55a8f6c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java @@ -83,7 +83,7 @@ public class SystemResourceService implements ISystemResourceService { }else { String hqlPack = CoreHqlPack.packHqlSysLocaleLanguage(lang); pager = PagerHelper.getPager(pager, sysLocaleLanguageRDao.findByHqlWhereCount(hqlPack)); - return new ListPager(sysLocaleLanguageRDao.findByHqlWherePage(hqlPack + lang.getOrderByParam(),pager),pager); + return new ListPager(sysLocaleLanguageRDao.findByHqlWherePage(hqlPack + lang.orderBy(),pager),pager); } } 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 4c40ebe..b2dcc26 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 @@ -4,9 +4,14 @@ 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.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.TaskTime; import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression; import cn.estsh.i3plus.pojo.platform.repository.TaskTimeExpressionRepository; +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; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -27,48 +32,71 @@ public class TaskTimeExpressionServiceImpl implements ITaskTimeExpressionService public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeExpressionServiceImpl.class); @Autowired - private TaskTimeExpressionRepository taskTimeRecordingRDao; + private TaskTimeExpressionRepository taskTimeExpressionRDao; + @Autowired + private TaskTimeRepository taskTimeRDao; @Override public void updateTaskTimeExpression(TaskTimeExpression taskTimeExpression) { - LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION :{}", taskTimeExpression); - taskTimeRecordingRDao.update(taskTimeExpression); + LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", taskTimeExpression); + taskTimeExpressionRDao.update(taskTimeExpression); } @Override public void deleteTaskTimeExpressionById(String id) { - LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION :{}", id); - taskTimeRecordingRDao.deleteById(Long.parseLong(id)); + LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", id); + taskTimeExpressionRDao.deleteById(Long.parseLong(id)); } @Override public TaskTimeExpression insertTaskTimeExpression(TaskTimeExpression taskTimeExpression) { - LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION :{}", taskTimeExpression); - return taskTimeRecordingRDao.insert(taskTimeExpression); + LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", taskTimeExpression); + return taskTimeExpressionRDao.insert(taskTimeExpression); } @Override public List listTaskTimeExpression() { - LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION list"); - return taskTimeRecordingRDao.list(); + LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION list"); + return taskTimeExpressionRDao.list(); } @Override public TaskTimeExpression getTaskTimeExpressionById(String id) { - LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION :{}" ,id); - return taskTimeRecordingRDao.getById(Long.parseLong(id)); + LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}" ,id); + return taskTimeExpressionRDao.getById(Long.parseLong(id)); } @Override public ListPager queryTaskTimeExpressionByPager(TaskTimeExpression taskTimeExpression, Pager pager) { - LOGGER.info("文件表达式 TaskTimeExpression taskTimeExpression:{}，Pager:{}",taskTimeExpression,pager); + LOGGER.info("文件表达式 TASK_TIME_EXPRESSION taskTimeExpression:{}，Pager:{}",taskTimeExpression,pager); if(taskTimeExpression == null) { - pager = PagerHelper.getPager(pager, taskTimeRecordingRDao.listCount()); - return new ListPager(taskTimeRecordingRDao.listPager(pager),pager); + pager = PagerHelper.getPager(pager, taskTimeExpressionRDao.listCount()); + return new ListPager(taskTimeExpressionRDao.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); + pager = PagerHelper.getPager(pager, taskTimeExpressionRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(taskTimeExpressionRDao.findByHqlWherePage(hqlPack + taskTimeExpression.orderBy(),pager),pager); + } + } + + @Override + public void deleteTaskTimeExpressionByIds(String[] ids) { + LOGGER.info("文件表达式 SYS_MENU ids:{}", ids); + long count = taskTimeRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("timeId",ids)); + if(count >= 1){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("存在关联定时任务无法删除！") + .setErrorSolution("请重新操作") + .build(); + }else { + Long[] array = new Long[ids.length]; + for (int i = 0; i < ids.length; i++) { + array[i] = Long.parseLong(ids[i]); + } + + taskTimeExpressionRDao.deleteByIds(array); } } } 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 7a6233a..e5a5fcc 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 @@ -4,14 +4,11 @@ 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.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; -import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.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; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +17,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * @Description : 定时任务业务接口实现 + * @Description : 定时任务业务接口实现 * @Reference : * @Author : wei.peng * @Date : 2018-10-22 16:58:43.974 @@ -85,4 +82,27 @@ public class TaskTimeServiceImpl implements ITaskTimeService { return new ListPager(taskTimeRDao.findByHqlWherePage(hqlPack + taskTime.orderBy(),pager),pager); } } + + @Override + public void deleteTaskTimeByIds(String[] ids) { + LOGGER.info("定时任务 TASK_TIME ids:{}", ids.toString()); + // 转换类型 + Long[] array = new Long[ids.length]; + for (int i = 0; i < ids.length; i++) { + array[i] = Long.parseLong(ids[i]); + } + + taskTimeRDao.deleteByIds(array); + } + + @Override + public void updateTaskTimeStatusByIds(String[] ids, Integer status) { + LOGGER.info("定时任务 TASK_TIME ids：{}，status：{}",ids,status); + StringBuffer where = new StringBuffer(); + HqlPack.getInPack(String.join(",", ids), "id", where); + + taskTimeRDao.updateByHqlWhere(where.toString(), "taskStatus", status); + } + + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolService.java index f2e040a..9681e38 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolService.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.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.Tool; import cn.estsh.i3plus.pojo.platform.bean.ToolType; import cn.estsh.i3plus.pojo.platform.repository.ToolRepository; @@ -36,7 +37,7 @@ public class ToolService implements IToolService { private ToolTypeRepository toolTypeRDao; @Override - public void insertTool(Tool tool) { + public Tool insertTool(Tool tool) { // 查询硬件类型名称 LOGGER.info("硬件类型 TOOL_TYPE :{}", tool.getToolTypeId()); ToolType toolType = toolTypeRDao.getById(tool.getToolTypeId()); @@ -45,7 +46,7 @@ public class ToolService implements IToolService { tool.setRedToolTypeName(toolType.getName()); LOGGER.info("硬件 TOOL tool:{}",tool); - toolRDao.insert(tool); + return toolRDao.insert(tool); } @Override @@ -93,16 +94,28 @@ public class ToolService implements IToolService { } @Override - public void updateStatusEnable(String id) { - LOGGER.info("硬件 TOOL id:{}",id); - toolRDao.updateByProperties("id",Long.parseLong(id), - "toolStatusId", CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); + public void updateToolStatusById(String id, Integer status) { + LOGGER.info("硬件 TOOL id:{}，status：{}",id,status); + toolRDao.updateByProperties("id",Long.parseLong(id),"toolStatusId", status); } @Override - public void updateStatusDisable(String id) { - LOGGER.info("硬件 TOOL id:{}",id); - toolRDao.updateByProperties("id",Long.parseLong(id), - "toolStatusId", CommonEnumUtil.DATA_STATUS.DISABLE.getValue()); + public void deleteToolByIds(String[] ids) { + LOGGER.info("消息 SYS_MESSAGE ids:{}", ids.toString()); + Long[] array = new Long[ids.length]; + for (int i = 0; i < ids.length; i++) { + array[i] = Long.parseLong(ids[i]); + } + + toolRDao.deleteByIds(array); + } + + @Override + public void updateToolStatusByIds(String[] ids, Integer status) { + LOGGER.info("硬件 TOOL ids：{}，status：{}",ids,status); + StringBuffer where = new StringBuffer(); + HqlPack.getInPack(String.join(",", ids), "id", where); + + toolRDao.updateByHqlWhere(where.toString(), "toolStatusId", status); } } 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 093738c..9f11dd5 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 @@ -43,7 +43,7 @@ public class ToolTypeService implements IToolTypeService { @Override public void deleteToolTypeById(String id) { LOGGER.info("硬件类型 TOOL_TYPE id:{}",id); - long count = toolRDao.findByPropertyCount("toolTypeId",id); + long count = toolRDao.findByPropertyCount("toolTypeId",Long.parseLong(id)); if(count >= 1){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index de908eb..83d583f 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -1,5 +1,5 @@ #项目端口 -server.port=8080 +server.port=8888 #用户登陆路径 filter.shiro.user.loginuri = /login 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 index 0519faa..98b07ed 100644 --- 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 @@ -56,6 +56,7 @@ public class TestTaskTimeService extends TestBase { public void testInsertTaskTime() { TaskTime taskTime = new TaskTime(); taskTime.setName("时间表达式"); + taskTime.setTimeId(1L); taskTime.setTaskStartDateTime("2018-01-01 00:00:00"); taskTime.setTaskEndDateTime("2018-12-31 00:00:00"); taskTime.setLastRunDateTime("2018-11-03 00:00:00"); @@ -88,7 +89,7 @@ public class TestTaskTimeService extends TestBase { @Test @Transactional public void testDeleteTaskTimeById(){ - taskTimeService.deleteTaskTimeById("1057111616417566720"); + taskTimeService.deleteTaskTimeById("1058406771644829696"); } /**