From 13403a35cc01f7fab7eea9451649862003afedad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 27 Aug 2019 14:00:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=9C=9F=E4=BF=AE=E6=94=B9=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/SysTaskCycleController.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) 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 e524a81..57239e0 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 @@ -10,6 +10,7 @@ import cn.estsh.i3plus.icloud.wms.sdk.IWmsScheduleJobCloud; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -168,8 +169,11 @@ public class SysTaskCycleController extends CoreBaseController { sysTaskPlan = sysTaskPlanService.getSysTaskPlanByNameAndGroup(item.getTaskPlanName(), item.getTaskPlanGroupName()); // 查找任务 sysTask = sysTaskService.getSysTaskById(sysTaskPlan.getTaskId()); - - if(sysTaskPlan == null || sysTask == null){ + // 查询调度库中数据是否存在 + BaseResultBean baseResultBean = + getJobService(sysTaskPlan.getTaskSoftTypeRdd()).checkJobExists(sysTask.getTaskPackage(), + sysTask.getTaskClass()); + if(sysTaskPlan == null || sysTask == null || (baseResultBean.isSuccess() && (boolean)baseResultBean.getResultObject())){ continue; } @@ -181,6 +185,13 @@ public class SysTaskCycleController extends CoreBaseController { // 更新关联模块的定时任务 getJobService(sysTaskPlan.getTaskSoftTypeRdd()).editTask(sysTask.getTaskPackage(), sysTask.getTaskClass(), sysTaskPlan.getName() , sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(), sysTaskPlan.getTaskPlanDescription()); + + // 停止或启用对应模块中的定时任务 + if (CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == sysTaskPlan.getTaskPlanStatusVal()) { + getJobService(sysTaskPlan.getTaskSoftTypeRdd()).resumeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); + } else if (CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() == sysTaskPlan.getTaskPlanStatusVal()) { + getJobService(sysTaskPlan.getTaskSoftTypeRdd()).pauseJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); + } } return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) {