diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java index f794aef..09eaf34 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java @@ -136,6 +136,8 @@ public interface IPersonnelService { List findSysRefUserInfoDepartmentByDepartmentIdList(List departmentIdList); + List findSysDepartmentByOrganizeIdList(List organizeIdList); + @ApiOperation(value = "查询用户部门关系") List findSysUserInfoDepartmentByInfoId(Long infoId); diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskCycleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskCycleService.java index 82daa2b..83dbb04 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskCycleService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskCycleService.java @@ -47,6 +47,13 @@ public interface ISysTaskCycleService { List listSysTaskCycle(); /** + * 根据组织代码查询任务周期信息 + * @return + */ + @ApiOperation(value = "根据组织代码查询任务周期信息",notes = "根据组织代码查询任务周期信息") + List listSysTaskCycleByOrg(String organizeCode); + + /** * 根据ID 查询任务周期 * @param id * @return diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskPlanService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskPlanService.java index 7947167..5d54cb8 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskPlanService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskPlanService.java @@ -52,6 +52,13 @@ public interface ISysTaskPlanService { List listSysTaskPlan(); /** + * 根据组织代码查询任务计划 + * @return + */ + @ApiOperation(value = "根据组织代码查询任务计划") + List listSysTaskPlanByOrg(String organizeCode); + + /** * 根据id查询任务计划数据 * @param id * @return diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskService.java index 0bd1681..49c01aa 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskService.java @@ -41,6 +41,13 @@ public interface ISysTaskService { List listSysTask(); /** + * 根据组织代码查询任务 + * @return + */ + @ApiOperation(value = "根据组织代码查询任务",notes = "根据组织代码查询任务") + List listSysTaskByOrg(String organizeCode); + + /** * 根据id查询任务信息 * @param id * @return diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolTypeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolTypeService.java index 94e9db5..a93f074 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolTypeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolTypeService.java @@ -22,7 +22,7 @@ public interface ISysToolTypeService { * @param toolType */ @ApiOperation(value = "新增硬件类型") - void insertSysToolType(SysToolType toolType); + SysToolType insertSysToolType(SysToolType toolType); /** * 删除硬件类型 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BaseMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BaseMessageController.java index 1f57842..340719c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BaseMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BaseMessageController.java @@ -14,6 +14,7 @@ import cn.estsh.i3plus.pojo.model.platform.RefUserMessagePagerModel; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; import cn.estsh.impp.framework.base.controller.CoreBaseController; +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; @@ -83,6 +84,10 @@ public class BaseMessageController extends CoreBaseController { sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue()); sysMessage.setReadCount(0L); + if(AuthUtil.getSession() != null){ + sysMessage.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + } + sysMessageService.doSendSysMessage(sysMessage); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { @@ -162,6 +167,13 @@ public class BaseMessageController extends CoreBaseController { */ public ResultBean baseQuerySysMessageByPager(@RequestBody MessagePagerModel messagePagerModel) { try { + // 数据权限 + if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)) { + messagePagerModel.getSysMessage().setOrganizeCode(null); + } else { + messagePagerModel.getSysMessage().setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + } + ListPager sysMessageListPager = sysMessageService.querySysMessageByPager(messagePagerModel.getSysMessage(), messagePagerModel.getPager()); return ResultBean.success("操作成功").setListPager(sysMessageListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -255,6 +267,13 @@ public class BaseMessageController extends CoreBaseController { */ public ResultBean baseQuerySysRefUserMessageByPager(RefUserMessagePagerModel refUserMessagePagerModel) { try { + // 数据权限 + if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)) { + refUserMessagePagerModel.getSysRefUserMessage().setOrganizeCode(null); + } else { + refUserMessagePagerModel.getSysRefUserMessage().setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + } + ListPager sysMessageListPager = sysMessageService.querySysRefUserMessageByPager( refUserMessagePagerModel.getSysRefUserMessage(), refUserMessagePagerModel.getPager()); return ResultBean.success("操作成功").setListPager(sysMessageListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index e3b8cd4..4fe7530 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -79,6 +79,9 @@ public class WhiteController extends CoreBaseController { @Autowired private ISysOrderNoRuleService sysOrderNoRuleService; + @Autowired + private ISysOrganizeService sysOrganizeService; + @Resource(name="redisRes") private ImppRedis redisRes; @@ -357,4 +360,17 @@ public class WhiteController extends CoreBaseController { CommonEnumUtil.LOG_LOGIN_PLATFORM platform = CommonEnumUtil.LOG_LOGIN_PLATFORM.valueOf(Integer.parseInt(value)); return platform == null ? CommonEnumUtil.LOG_LOGIN_PLATFORM.PC_IMPP_CORE : platform; } + + @GetMapping("/sys-organize/list") + @ApiOperation(value = "获取全部组织", notes = "获取全部组织") + public ResultBean findSysOrganizeList(){ + try { + List sysOrganizeList = sysOrganizeService.findSysOrganizeList(); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysOrganizeList); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index 48dd93b..4c912bb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -764,4 +764,23 @@ public class PersonnelController extends CoreBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + + /** + * 查询所有组织信息 + * @return 处理结果 + */ + @GetMapping(value = "/organize/list") + @ApiOperation(value = "查询所有组织信息", notes = "查询所有组织信息") + public ResultBean findSysOrganizeList(){ + try{ + List sysOrganize = personnelService.findSysOrganizeList(); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(sysOrganize); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java index a97ab1d..6244617 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java @@ -109,13 +109,19 @@ public class SysDepartmentController extends CoreBaseController { .notNull("departmentCode", department.getDepartmentCode()) .checkNotZero("organizeId",department.getOrganizeId()); + SysDepartment sysDepartment = departmentService.getSysDepartmentById(department.getId()); + sysDepartment.setName(department.getName()); + sysDepartment.setDepartmentCode(department.getDepartmentCode()); + sysDepartment.setDepartmentSort(department.getDepartmentSort()); + sysDepartment.setParentId(department.getParentId()); + ConvertBean.modelUpdate(department, user); - if(department.getParentId() == null || department.getParentId() <= 0){ - department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); - department.setParentNameRdd("顶级部门"); + if(sysDepartment.getParentId() == null || department.getParentId() <= 0){ + sysDepartment.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + sysDepartment.setParentNameRdd("顶级部门"); } - departmentService.updateSysDepartment(department); + departmentService.updateSysDepartment(sysDepartment); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java index 3decb90..88dea89 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java @@ -153,7 +153,7 @@ public class SysLogExceptionController extends CoreBaseController { excelFile.createNewFile(); excelTool.exportData(excelFile, listPager.getObjectList(), SysLogException.class, colName); - result.add(sysFileService.uploadFile(excelFile)); + sysFileService.uploadFile(excelFile); pager.setCurrentPage(pager.getCurrentPage() + 1); } while (pager.getCurrentPage() <= pager.getTotalPages()); @@ -176,7 +176,9 @@ public class SysLogExceptionController extends CoreBaseController { if (zipFile != null) { FileTool.deleteFile(zipFile.getPath()); } - FileTool.deleteFile(excelDir.getPath()); + if(excelDir != null){ + FileTool.deleteFile(excelDir.getPath()); + } } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java index ce7fcf8..1cdeacc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java @@ -232,7 +232,7 @@ public class SysLogOperateController extends CoreBaseController { excelFile.createNewFile(); excelTool.exportData(excelFile, listPager.getObjectList(), SysLogOperate.class, colName); - result.add(sysFileService.uploadFile(excelFile)); + sysFileService.uploadFile(excelFile); pager.setCurrentPage(pager.getCurrentPage() + 1); } while (pager.getCurrentPage() <= pager.getTotalPages()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java index e124a97..b36ef7f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java @@ -226,7 +226,7 @@ public class SysLogSystemController extends CoreBaseController{ excelFile.createNewFile(); excelTool.exportData(excelFile, listPager.getObjectList(), SysLogSystem.class, colName); - result.add(sysFileService.uploadFile(excelFile)); + sysFileService.uploadFile(excelFile); pager.setCurrentPage(pager.getCurrentPage() + 1); } while (pager.getCurrentPage() <= pager.getTotalPages()); 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 cbda426..384b8d7 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 @@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.model.platform.RefUserMessagePagerModel; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; import cn.estsh.impp.framework.base.controller.CoreBaseController; +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.util.ResultBean; @@ -286,6 +287,8 @@ public class SysMessageController extends CoreBaseController { sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue()); sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.INTERNAL.getValue()); + sysMessage.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + sysMessageService.doSendSysMessage(sysMessage); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java index bea6e70..c922652 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java @@ -118,13 +118,20 @@ public class SysOrganizeController extends CoreBaseController{ .notNull("organizeCode", organize.getOrganizeCode()) .notNull("organizeType", organize.getOrganizeType()); - ConvertBean.modelUpdate(organize, AuthUtil.getSessionUser()); + SysOrganize sysOrganize = organizeService.getSysOrganizeById(organize.getId()); + if(organize.getParentId() == null || organize.getParentId() <= 0){ - organize.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); - organize.setParentNameRdd("顶级组织"); + sysOrganize.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + sysOrganize.setParentNameRdd("顶级组织"); } - organizeService.updateSysOrganize(organize); + sysOrganize.setName(organize.getName()); + sysOrganize.setOrganizeType(organize.getOrganizeType()); + sysOrganize.setOrganizeAddress(organize.getOrganizeAddress()); + sysOrganize.setOrganizeSort(organize.getOrganizeSort()); + ConvertBean.modelUpdate(sysOrganize,getSessionUser()); + + organizeService.updateSysOrganize(sysOrganize); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java index c25f392..0804218 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java @@ -106,14 +106,19 @@ public class SysPositionController extends CoreBaseController { .notNull("name", position.getName()) .notNull("positionCode", position.getPositionCode()); + SysPosition sysPosition = positionService.getSysPositionById(position.getId()); + sysPosition.setName(position.getName()); + sysPosition.setPositionCode(position.getPositionCode()); + sysPosition.setParentId(position.getParentId()); + //修改初始化 - ConvertBean.modelUpdate(position, user); - if (position.getParentId() == null || position.getParentId() <= 0) { - position.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); - position.setParentNameRdd("顶级岗位"); + ConvertBean.modelUpdate(sysPosition, user); + if (sysPosition.getParentId() == null || position.getParentId() <= 0) { + sysPosition.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + sysPosition.setParentNameRdd("顶级岗位"); } - positionService.updateSysPosition(position); + positionService.updateSysPosition(sysPosition); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java index 2df8449..c0b792a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java @@ -16,6 +16,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysTask; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.base.service.CommonServiceImpl; import cn.estsh.impp.framework.base.service.ICommonService; +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; @@ -115,6 +116,9 @@ public class SysTaskController extends CoreBaseController { .build(); } + // 设置组织代码 + sysTask.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + sysTaskService.insertSysTask(sysTask); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysTask); } catch (ImppBusiException busExcep) { @@ -188,7 +192,12 @@ public class SysTaskController extends CoreBaseController { @ApiOperation(value = "查询所有任务", notes = "查询所有任务") public ResultBean listSysTask() { try { - List sysTaskList = sysTaskService.listSysTask(); + List sysTaskList; + if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){ + sysTaskList = sysTaskService.listSysTask(); + } else { + sysTaskList = sysTaskService.listSysTaskByOrg(AuthUtil.getOrganize().getOrganizeCode()); + } return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysTaskList); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -207,6 +216,12 @@ public class SysTaskController extends CoreBaseController { @ApiOperation(value = "任务复杂查询", notes = "任务复杂查询,分页，排序") public ResultBean querySysTaskByPager(SysTask sysTask, Pager pager) { try { + if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){ + sysTask.setOrganizeCode(null); + } else { + sysTask.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + } + ListPager sysTaskList = sysTaskService.querySysTaskByPager(sysTask, pager); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysTaskList); } catch (ImppBusiException busExcep) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java index a047467..ac5e5b6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java @@ -19,6 +19,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysTask; import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle; import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan; import cn.estsh.impp.framework.base.controller.CoreBaseController; +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.quartz.IQuartzJobService; @@ -121,6 +122,9 @@ public class SysTaskCycleController extends CoreBaseController { trigger.setCronExpression(sysTaskCycle.getTaskCycleExps()); trigger.computeFirstFireTime(null); + // 设置组织代码 + sysTaskCycle.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + sysTaskCycleService.insertSysTaskCycle(sysTaskCycle); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { @@ -225,7 +229,12 @@ public class SysTaskCycleController extends CoreBaseController { @ApiOperation(value = "查询所有任务周期信息", notes = "查询所有任务周期信息") public ResultBean findSysTaskCycle() { try { - List list = sysTaskCycleService.listSysTaskCycle(); + List list; + if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){ + list = sysTaskCycleService.listSysTaskCycle(); + } else { + list = sysTaskCycleService.listSysTaskCycleByOrg(AuthUtil.getOrganize().getOrganizeCode()); + } return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -261,15 +270,21 @@ public class SysTaskCycleController extends CoreBaseController { /** * 任务周期查询，分页，排序 - * @param taskTimeExpression 查询条件 + * @param sysTaskCycle 查询条件 * @param pager 分页信息 * @return 处理结果 */ @GetMapping("/query") @ApiOperation(value = "任务周期查询，分页，排序", notes = "任务周期查询，分页，排序") - public ResultBean querySysTaskCycleByPager(SysTaskCycle taskTimeExpression, Pager pager) { + public ResultBean querySysTaskCycleByPager(SysTaskCycle sysTaskCycle, Pager pager) { try { - ListPager listPager = sysTaskCycleService.querySysTaskCycleByPager(taskTimeExpression, pager); + if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){ + sysTaskCycle.setOrganizeCode(null); + } else { + sysTaskCycle.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + } + + ListPager listPager = sysTaskCycleService.querySysTaskCycleByPager(sysTaskCycle, pager); return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java index 0f29094..d8e6197 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java @@ -3,11 +3,11 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskCycleService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService; -import cn.estsh.i3plus.icloud.andon.sdk.IAndonCommonCloud; import cn.estsh.i3plus.icloud.andon.sdk.IAndonScheduleJobCloud; import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnScheduleJobCloud; import cn.estsh.i3plus.icloud.mes.sdk.IMesScheduleJobCloud; import cn.estsh.i3plus.icloud.wms.sdk.IWmsScheduleJobCloud; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; @@ -21,19 +21,22 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController; 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.quartz.IQuartzJobService; import cn.estsh.impp.framework.boot.quartz.ScheduleTool; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; -import com.netflix.discovery.converters.Auto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; /** @@ -164,6 +167,9 @@ public class SysTaskPlanController extends CoreBaseController { .build(); } + // 设置组织代码 + sysTaskPlan.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + sysTaskPlan = sysTaskPlanService.insertSysTaskPlan(sysTaskPlan); // 立即执行 @@ -301,7 +307,12 @@ public class SysTaskPlanController extends CoreBaseController { @ApiOperation(value = "查询所有任务计划", notes = "查询所有任务计划") public ResultBean findSysTaskTimeAll() { try { - List list = sysTaskPlanService.listSysTaskPlan(); + List list; + if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)) { + list = sysTaskPlanService.listSysTaskPlan(); + } else { + list = sysTaskPlanService.listSysTaskPlanByOrg(AuthUtil.getOrganize().getOrganizeCode()); + } return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -373,15 +384,21 @@ public class SysTaskPlanController extends CoreBaseController { /** * 任务计划复杂查询，分页，排序 * - * @param taskTime 查询条件 + * @param sysTaskPlan 查询条件 * @param pager 分页信息 * @return 处理结果 */ @GetMapping("/query") @ApiOperation(value = "任务计划复杂查询，分页，排序", notes = "任务计划复杂查询，分页，排序") - public ResultBean querySysTaskTimeByPager(SysTaskPlan taskTime, Pager pager) { + public ResultBean querySysTaskTimeByPager(SysTaskPlan sysTaskPlan, Pager pager) { try { - ListPager taskTimeListPager = sysTaskPlanService.querySysTaskPlanByPager(taskTime, pager); + if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)) { + sysTaskPlan.setOrganizeCode(null); + } else { + sysTaskPlan.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + } + + ListPager taskTimeListPager = sysTaskPlanService.querySysTaskPlanByPager(sysTaskPlan, pager); return ResultBean.success("操作成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/TestCRUDPressure.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/TestCRUDPressure.java new file mode 100644 index 0000000..46e8f73 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/TestCRUDPressure.java @@ -0,0 +1,180 @@ +package cn.estsh.i3plus.core.apiservice.schedulejob; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysFileAttachService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleLanguageService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskCycleService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysToolService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysToolTypeService; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysFile; +import cn.estsh.i3plus.pojo.platform.bean.SysFileAttach; +import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; +import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; +import cn.estsh.i3plus.pojo.platform.bean.SysMessage; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; +import cn.estsh.i3plus.pojo.platform.bean.SysTask; +import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle; +import cn.estsh.i3plus.pojo.platform.bean.SysTool; +import cn.estsh.i3plus.pojo.platform.bean.SysToolType; +import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob; +import cn.estsh.impp.framework.boot.init.ApplicationProperties; +import org.quartz.JobExecutionContext; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description : 压力测试 CRUD + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-07-17 11:31 + * @Modify: + **/ +public class TestCRUDPressure extends BaseImppScheduleJob { + + @Autowired + private ISysToolService sysToolService; + + @Autowired + private ISysToolTypeService sysToolTypeService; + + @Autowired + private ISysMessageService sysMessageService; + + @Autowired + private ISysFileService sysFileService; + + @Autowired + private ISysLocaleLanguageService sysLocaleLanguageService; + + @Autowired + private ISysLocaleResourceService sysLocaleResourceService; + + @Autowired + private ISysFileAttachService sysFileAttachService; + + @Autowired + private ISysTaskService sysTaskService; + + @Autowired + private ISysTaskCycleService sysTaskCycleService; + + + private String testName = "定时任务压力测试 "; + private String testUpdate = " 修改"; + + public TestCRUDPressure() { + super(TestCRUDPressure.class, "定时任务压力测试"); + } + + @Override + public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { + // 硬件 + // 新增 + SysToolType sysToolType = new SysToolType(); + sysToolType.setName(testName + "硬件类型"); + sysToolType = sysToolTypeService.insertSysToolType(sysToolType); + + SysTool sysTool = new SysTool(); + sysTool.setName(testName + "硬件"); + sysTool.setToolTypeId(sysToolType.getId()); + sysTool = sysToolService.insertSysTool(sysTool); + + SysMessage sysMessage = new SysMessage(); + sysMessage.setMessageTitle(testName + "消息"); + sysMessage = sysMessageService.insertSysMessage(sysMessage); + + SysRefUserMessage sysRefUserMessage = new SysRefUserMessage(); + sysRefUserMessage.setMessageTitleRdd(testName + "用户消息"); + sysRefUserMessage.setMessageId(sysMessage.getId()); + sysRefUserMessage = sysMessageService.insertSysRefUserMessage(sysRefUserMessage); + + SysFile sysFile = new SysFile(); + sysFile.setName(testName + "文件"); + sysFile.setFileCode(System.currentTimeMillis() + "-" + Math.random()); + sysFile = sysFileService.insertSysFile(sysFile); + + SysLocaleLanguage sysLocaleLanguage = new SysLocaleLanguage(); + sysLocaleLanguage.setLanguageName(testName + "语言"); + sysLocaleLanguage.setLanguageCode(System.currentTimeMillis() + "-" + Math.random()); + sysLocaleLanguage.setIsDefault(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + sysLocaleLanguage = sysLocaleLanguageService.insertSysLocaleLanguage(sysLocaleLanguage); + + SysLocaleResource sysLocaleResource = new SysLocaleResource(); + sysLocaleResource.setResourceKey(System.currentTimeMillis() + "-" + Math.random()); + sysLocaleResource.setLanguageCode(sysLocaleLanguage.getLanguageCode()); + sysLocaleResource = sysLocaleResourceService.insertSysLocaleResource(sysLocaleResource); + + SysFileAttach sysFileAttach = new SysFileAttach(); + sysFileAttach.setFileNameRdd(testName + "附件文件名称"); + sysFileAttach = sysFileAttachService.insertSysFileAttach(sysFileAttach); + + SysTask sysTask = new SysTask(); + sysTask.setName(testName + "任务 " + System.currentTimeMillis() + "-" + Math.random()); + sysTask = sysTaskService.insertSysTask(sysTask); + + SysTaskCycle sysTaskCycle = new SysTaskCycle(); + sysTaskCycle.setName(testName + "任务周期"); + sysTaskCycle = sysTaskCycleService.insertSysTaskCycle(sysTaskCycle); + + // 修改 + sysTool.setName(sysTool.getName() + testUpdate); + sysToolService.updateSysTool(sysTool); + + sysToolType.setName(sysToolType.getName() + testUpdate); + sysToolTypeService.updateSysToolType(sysToolType); + + sysMessage.setMessageTitle(sysMessage.getMessageTitle() + testUpdate); + sysMessageService.updateSysMessage(sysMessage); + + sysRefUserMessage.setMessageSoftType(1); + sysMessageService.insertSysRefUserMessage(sysRefUserMessage); + + sysFile.setName(sysFile.getName() + testUpdate); + sysFileService.updateSysFile(sysFile); + + sysLocaleLanguage.setLanguageName(sysLocaleLanguage.getLanguageName() + testUpdate); + sysLocaleLanguageService.updateSysLocaleLanguage(sysLocaleLanguage); + + sysLocaleResource.setResourceKey(sysLocaleResource.getResourceKey() + testUpdate); + sysLocaleResourceService.updateSysLocaleResource(sysLocaleResource); + + sysFileAttach.setFileNameRdd(sysFileAttach.getFileNameRdd() + testUpdate); + sysFileAttach.setRefId(sysMessage.getId()); + sysFileAttachService.insertSysFileAttach(sysFileAttach); + + sysTask.setName(sysTask.getName() + testUpdate); + sysTaskService.updateSysTask(sysTask); + + sysTaskCycle.setName(sysTaskCycle.getName() + testUpdate); + sysTaskCycleService.updateSysTaskCycle(sysTaskCycle); + + //查 + sysToolService.getSysToolById(sysTool.getId()); + sysToolTypeService.getSysToolTypeById(sysTool.getToolTypeId()); + sysMessageService.getSysMessageById(sysMessage.getId()); + sysMessageService.doGetSysMessageByRefUserMessageId(sysRefUserMessage.getId()); + sysFileService.getSysFileById(sysFile.getId()); + sysLocaleLanguageService.getSysLocaleLanguageById(sysLocaleLanguage.getId()); + sysLocaleResourceService.getSysLocaleResourceById(sysLocaleResource.getId()); + sysFileAttachService.findSysFileAttachByRefId(sysMessage.getId()); + sysTaskService.getSysTaskById(sysTask.getId()); + sysTaskCycleService.getSysTaskCycleById(sysTaskCycle.getId()); + + // 删除 + sysToolService.deleteSysToolById(sysTool.getId()); + sysToolTypeService.deleteSysToolTypeById(sysTool.getToolTypeId()); + sysMessageService.deleteSysMessageById(sysMessage.getId()); + sysMessageService.deleteSysRefUserMessageById(sysRefUserMessage.getId()); + sysFileService.deleteSysFileById(sysFile.getId()); + sysLocaleResourceService.deleteSysLocaleResourceById(sysLocaleResource.getId()); + sysLocaleLanguageService.deleteSysLocaleLanguageById(sysLocaleLanguage.getId()); + sysFileAttachService.deleteSysFileAttachByRefId(sysMessage.getId()); + sysTaskService.deleteSysTaskById(sysTask.getId()); + sysTaskCycleService.deleteSysTaskCycleById(sysTaskCycle.getId()); + + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/wms/WmsDualTransStockJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/wms/WmsDualTransStockJob.java deleted file mode 100644 index 40e2ca3..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/wms/WmsDualTransStockJob.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.schedulejob.wms; - -import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob; -import cn.estsh.impp.framework.boot.init.ApplicationProperties; -import io.swagger.annotations.ApiOperation; -import org.quartz.JobExecutionContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @Description : 定时处理库存移动单信息 - * @Reference : - * @Author : siliter - * @CreateDate : 2019-03-07 13:25 - * @Modify: - **/ -@ApiOperation("定时处理库存移动单信息") -public class WmsDualTransStockJob extends BaseImppScheduleJob { - public static final Logger LOGGER = LoggerFactory.getLogger(WmsDualTransStockJob.class); - - public WmsDualTransStockJob() { - super(WmsDualTransStockJob.class,"定时处理库存移动单信息"); - } - - @Override - public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { - System.out.println("定时任务被执行"); - LOGGER.info("projectName：{},port:{}",applicationProperties.getApplicationName(),applicationProperties.getServerPort()); - } -} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java index 2c84304..90aca8c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java @@ -399,10 +399,10 @@ public class CoreMemTreeService implements ICoreMemTreeService { // 通过组织获取部门信息 if (organizeId != null && organizeId > 0) { List organizeIdList = findSysOrganizeChildIdList(organizeId); - List refUserDepartmentList = personnelService.findSysRefUserDepartmentByOrganizeIdList(organizeIdList); - if (refUserDepartmentList != null && refUserDepartmentList.size() > 0) { - for (SysRefUserDepartment ref : refUserDepartmentList) { - refIdList.add(ref.getDepartmentId()); + List departmentList = personnelService.findSysDepartmentByOrganizeIdList(organizeIdList); + if (departmentList != null && departmentList.size() > 0) { + for (SysDepartment department : departmentList) { + refIdList.add(department.getId()); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index 8dc03bd..318c72f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -446,6 +446,16 @@ public class PersonnelServiceService implements IPersonnelService { } @Override + public List findSysDepartmentByOrganizeIdList(List organizeIdList) { + LOGGER.info("平台账号部门 SysRefUserInfoDepartment organizeIdList:{}", organizeIdList); + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getInPackList(organizeIdList,"organizeId",packBean); + + return departmentRDao.findByHqlWhere(packBean); + } + + @Override @ApiOperation(value = "查询用户部门关系") public List findSysUserInfoDepartmentByInfoId(Long infoId) { LOGGER.info("平台用户部门 SysDepartment infoId:{}", infoId); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java index 002d12e..069f5a6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java @@ -69,6 +69,7 @@ public class SysDepartmentService implements ISysDepartmentService { SysOrganize organize = organizeRDao.getById(department.getOrganizeId()); ValidatorBean.checkNotNull(organize); + department.setOrganizeCode(organize.getOrganizeCode()); department.setOrganizeNameRdd(organize.getName()); LOGGER.info("部门信息 DEPARTMENT {}", department); @@ -158,9 +159,10 @@ public class SysDepartmentService implements ISysDepartmentService { // 查询所属组织名称 LOGGER.info("组织信息 ORGANIZE organizeId:{}", department.getOrganizeId()); SysOrganize organize = organizeRDao.getById(department.getOrganizeId()); - ValidatorBean.checkNotNull(organize); + ValidatorBean.checkNotNull(organize,"不存的组织信息"); department.setOrganizeNameRdd(organize.getName()); + department.setOrganizeCode(organize.getOrganizeCode()); // 新增部门 LOGGER.info("部门信息 DEPARTMENT department:{}", department); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java index 81ea363..8bff7a5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java @@ -78,6 +78,12 @@ public class SysTaskCycleService implements ISysTaskCycleService { } @Override + @ApiOperation(value = "根据组织代码查询任务周期信息",notes = "根据组织代码查询任务周期信息") + public List listSysTaskCycleByOrg(String organizeCode) { + return sysTaskCycleRDao.findByProperty("organizeCode",organizeCode); + } + + @Override @ApiOperation(value = "根据ID 查询任务周期",notes = "根据ID 查询任务周期") public SysTaskCycle getSysTaskCycleById(Long id) { return sysTaskCycleRDao.getById(id); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java index 35dc88f..d3a8ad6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java @@ -138,6 +138,12 @@ public class SysTaskPlanService implements ISysTaskPlanService { } @Override + @ApiOperation(value = "根据组织代码查询任务计划") + public List listSysTaskPlanByOrg(String organizeCode) { + return sysTaskPlanRDao.findByProperty("organizeCode", organizeCode); + } + + @Override @ApiOperation(value = "根据id查询任务计划数据", notes = "根据id查询任务计划数据") public SysTaskPlan getSysTaskPlanById(Long id) { return sysTaskPlanRDao.getById(id); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java index cc7caa4..df89a9b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java @@ -91,6 +91,12 @@ public class SysTaskService implements ISysTaskService { } @Override + @ApiOperation(value = "根据组织代码查询任务",notes = "根据组织代码查询任务") + public List listSysTaskByOrg(String organizeCode) { + return sysTaskRDao.findByProperty("organizeCode",organizeCode); + } + + @Override @ApiOperation(value = "根据id查询任务信息",notes = "根据id查询任务信息") public SysTask getSysTaskById(Long id) { return sysTaskRDao.getById(id); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java index b8fa9b9..4d87927 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java @@ -39,9 +39,9 @@ public class SysToolTypeService implements ISysToolTypeService { @Override @ApiOperation(value = "新增硬件类型") - public void insertSysToolType(SysToolType toolType) { + public SysToolType insertSysToolType(SysToolType toolType) { LOGGER.info("硬件类型 TOOL_TYPE toolType:{}",toolType); - toolTypeRDao.insert(toolType); + return toolTypeRDao.insert(toolType); } @Override