Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

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) {