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 6e325ac..5947c7f 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 @@ -163,8 +163,7 @@ public class SysTaskPlanController extends CoreBaseController{ try { ResultBean resultBean = ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultObject(sysTaskPlan) - .build(); + .setResultObject(sysTaskPlan); // 数据校验 ValidatorBean.beginValid(sysTaskPlan) .notNull("name", sysTaskPlan.getName()) @@ -188,6 +187,7 @@ public class SysTaskPlanController extends CoreBaseController{ sysTaskPlanService.updateSysTaskPlan(sysTaskPlan); + // 调用对应微服务的检查接口 LOGGER.info("微服定时任务数据校验:name:{}, groupName:{}", sysTaskPlan.getName(), sysTaskPlan.getGroupName()); BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()) .checkJobExists(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); @@ -201,15 +201,13 @@ public class SysTaskPlanController extends CoreBaseController{ resultBean = ResultBean.fail(baseResultBean.getErrorMsg()); } - // 修改对应模块中的定时任务 + // 修改对应微服务的定时任务 LOGGER.info("微服修改定时任务数据:taskPlan", sysTaskPlan.toString()); baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()) .editTask(sysTask.getTaskPackage(), sysTask.getTaskClass(), sysTaskPlan.getName(), sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(), sysTaskPlan.getTaskPlanParam()); if(!baseResultBean.isSuccess()){ resultBean = ResultBean.fail(baseResultBean.getErrorMsg()); - } else { - } // 是否立即执行 @@ -240,7 +238,7 @@ public class SysTaskPlanController extends CoreBaseController{ sysTaskPlanService.deleteSysTaskPlanById(Long.parseLong(id)); getJobService(sysTaskPlan.getTaskSoftTypeRdd()).deleteTask(sysTaskPlan.getName(),sysTaskPlan.getGroupName()); - return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).build(); + return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -328,7 +326,8 @@ public class SysTaskPlanController extends CoreBaseController{ SysTaskPlan sysTaskPlan = sysTaskPlanService.getSysTaskPlanById(Long.parseLong(id)); // 执行定时任务 - BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); + BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()) + .executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); if(baseResultBean.isSuccess()){ return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else{ 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 9e30ce4..a7e5fa0 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 @@ -83,10 +83,26 @@ public class SysTaskPlanService implements ISysTaskPlanService { "taskCycleId", oldSysTaskPlan.getTaskCycleId() ); - sysTaskPlan.setTaskPlanExecNum(oldSysTaskPlan.getTaskPlanExecNum()); - sysTaskPlan.setLastRunDateTime(oldSysTaskPlan.getLastRunDateTime()); - sysTaskPlan.setTaskPlanStatus(oldSysTaskPlan.getTaskPlanStatus()); - sysTaskPlanRDao.update(sysTaskPlan); + oldSysTaskPlan.setTaskCycleId(sysTaskPlan.getTaskCycleId()); + oldSysTaskPlan.setTaskCycleNameRdd(sysTaskPlan.getTaskCycleNameRdd()); + oldSysTaskPlan.setTaskCycleExpsRdd(sysTaskPlan.getTaskCycleExpsRdd()); + oldSysTaskPlan.setTaskCycleNameRdd(sysTaskPlan.getTaskCycleNameRdd()); + oldSysTaskPlan.setTaskPlanExecNum(sysTaskPlan.getTaskPlanExecNum()); + oldSysTaskPlan.setTaskMethodType(sysTaskPlan.getTaskMethodType()); + oldSysTaskPlan.setTaskId(sysTaskPlan.getTaskId()); + oldSysTaskPlan.setTaskNameRdd(sysTaskPlan.getTaskNameRdd()); + oldSysTaskPlan.setTaskSoftTypeRdd(sysTaskPlan.getTaskSoftTypeRdd()); + oldSysTaskPlan.setTaskPlanParam(sysTaskPlan.getTaskPlanParam()); + oldSysTaskPlan.setTaskCycleStartDateTimeRdd(sysTaskPlan.getTaskCycleStartDateTimeRdd()); + oldSysTaskPlan.setTaskCycleEndDateTimeRdd(sysTaskPlan.getTaskCycleEndDateTimeRdd()); + oldSysTaskPlan.setTaskPlanDescription(sysTaskPlan.getTaskPlanDescription()); + oldSysTaskPlan.setLastRunDateTime(sysTaskPlan.getLastRunDateTime()); + oldSysTaskPlan.setIsNotice(sysTaskPlan.getIsNotice()); + oldSysTaskPlan.setIsInternalUser(sysTaskPlan.getIsInternalUser()); + oldSysTaskPlan.setNoticeChannel(sysTaskPlan.getNoticeChannel()); + oldSysTaskPlan.setNoticeMethod(sysTaskPlan.getNoticeMethod()); + oldSysTaskPlan.setTaskPlanStatus(sysTaskPlan.getTaskPlanStatus()); + sysTaskPlanRDao.update(oldSysTaskPlan); } @Override