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 e3a00ca..a047467 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 @@ -3,6 +3,9 @@ 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.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.tool.StringTool; @@ -63,6 +66,15 @@ public class SysTaskCycleController extends CoreBaseController { @Autowired private IWmsScheduleJobCloud wmsScheduleJobCloud; + @Autowired + private IMesScheduleJobCloud mesScheduleJobCloud; + + @Autowired + private IMesPcnScheduleJobCloud mesPcnScheduleJobCloud; + + @Autowired + private IAndonScheduleJobCloud andonScheduleJobCloud; + /** * 根据来源切换定时任务服务 * @@ -72,11 +84,21 @@ public class SysTaskCycleController extends CoreBaseController { private IQuartzJobService getJobService(int source) { IQuartzJobService quartzJobService = scheduleTool; + //平台定时任务 if (source == CommonEnumUtil.SOFT_TYPE.CORE.getValue()) { - //平台定时任务 quartzJobService = scheduleTool; + // WMS } else if (source == CommonEnumUtil.SOFT_TYPE.WMS.getValue()) { quartzJobService = wmsScheduleJobCloud; + // MES + } else if (source == CommonEnumUtil.SOFT_TYPE.MES.getValue()) { + quartzJobService = mesScheduleJobCloud; + // MES_PCN + } else if (source == CommonEnumUtil.SOFT_TYPE.MES_PCN.getValue()) { + quartzJobService = mesPcnScheduleJobCloud; + // ANDON + } else if(source == CommonEnumUtil.SOFT_TYPE.ANDON.getValue()){ + quartzJobService = andonScheduleJobCloud; } return quartzJobService; } @@ -136,8 +158,14 @@ public class SysTaskCycleController extends CoreBaseController { SysTaskPlan sysTaskPlan; SysTask sysTask; for (SysRefTaskCyclePlan item : taskCyclePlans) { + // 查找关联任务计划 sysTaskPlan = sysTaskPlanService.getSysTaskPlanByNameAndGroup(item.getTaskPlanName(), item.getTaskPlanGroupName()); + ValidatorBean.checkNotNull(sysTaskPlan, "任务计划不存在," + + "组名称:【" + item.getTaskPlanGroupName() + "】,名称:【" + item.getTaskPlanName() + "】"); + + // 查找任务 sysTask = sysTaskService.getSysTaskById(sysTaskPlan.getTaskId()); + ValidatorBean.checkNotNull(sysTask, "任务不存在:【" + sysTaskPlan.getTaskNameRdd() + "】"); sysTaskPlan.setTaskCycleNameRdd(sysTaskCycle.getName()); sysTaskPlan.setTaskCycleExpsRdd(sysTaskCycle.getTaskCycleExps());