|
|
@ -28,7 +28,6 @@ import org.slf4j.Logger;
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
@ -107,7 +106,8 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
sysTaskPlan.setTaskPlanStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
|
|
|
|
sysTaskPlan.setTaskPlanStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
|
|
|
|
|
|
|
|
|
|
|
|
// 唯一检查
|
|
|
|
// 唯一检查
|
|
|
|
BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).checkJobExists(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
|
|
|
|
BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd())
|
|
|
|
|
|
|
|
.checkJobExists(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
|
|
|
|
if(baseResultBean.isSuccess()){
|
|
|
|
if(baseResultBean.isSuccess()){
|
|
|
|
throw ImppExceptionBuilder.newInstance()
|
|
|
|
throw ImppExceptionBuilder.newInstance()
|
|
|
|
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
|
|
|
|
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
|
|
|
@ -132,7 +132,8 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
|
|
|
|
|
|
|
|
// 立即执行
|
|
|
|
// 立即执行
|
|
|
|
if(isExecute != null && isExecute){
|
|
|
|
if(isExecute != null && isExecute){
|
|
|
|
baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
|
|
|
|
baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd())
|
|
|
|
|
|
|
|
.executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
|
|
|
|
if (!baseResultBean.isSuccess()) {
|
|
|
|
if (!baseResultBean.isSuccess()) {
|
|
|
|
throw ImppExceptionBuilder.newInstance()
|
|
|
|
throw ImppExceptionBuilder.newInstance()
|
|
|
|
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
|
|
|
|
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
|
|
|
@ -149,6 +150,12 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 修改任务计划
|
|
|
|
|
|
|
|
* @param sysTaskPlan 任务计划对象
|
|
|
|
|
|
|
|
* @param isExecute 是否立即执行
|
|
|
|
|
|
|
|
* @return 处理结果
|
|
|
|
|
|
|
|
*/
|
|
|
|
@PutMapping(value = "/update")
|
|
|
|
@PutMapping(value = "/update")
|
|
|
|
@ApiOperation(value = "修改任务计划", notes = "任务计划")
|
|
|
|
@ApiOperation(value = "修改任务计划", notes = "任务计划")
|
|
|
|
public ResultBean updateSysTaskTime(SysTaskPlan sysTaskPlan, Boolean isExecute) {
|
|
|
|
public ResultBean updateSysTaskTime(SysTaskPlan sysTaskPlan, Boolean isExecute) {
|
|
|
@ -177,8 +184,8 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
sysTaskPlanService.updateSysTaskPlan(sysTaskPlan);
|
|
|
|
sysTaskPlanService.updateSysTaskPlan(sysTaskPlan);
|
|
|
|
|
|
|
|
|
|
|
|
// 修改对应模块中的定时任务
|
|
|
|
// 修改对应模块中的定时任务
|
|
|
|
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).editTask(sysTask.getTaskPackage(),sysTask.getTaskClass(),sysTaskPlan.getName()
|
|
|
|
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).editTask(sysTask.getTaskPackage(), sysTask.getTaskClass(), sysTaskPlan.getName(),
|
|
|
|
,sysTaskPlan.getGroupName(),sysTaskCycle.getTaskCycleExps(),sysTaskPlan.getTaskPlanDescription());
|
|
|
|
sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(), sysTaskPlan.getTaskPlanDescription());
|
|
|
|
|
|
|
|
|
|
|
|
if(isExecute != null && isExecute){
|
|
|
|
if(isExecute != null && isExecute){
|
|
|
|
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
|
|
|
|
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
|
|
|
@ -203,7 +210,7 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
sysTaskPlanService.deleteSysTaskPlanById(Long.parseLong(id));
|
|
|
|
sysTaskPlanService.deleteSysTaskPlanById(Long.parseLong(id));
|
|
|
|
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).deleteTask(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
|
|
|
|
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).deleteTask(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
|
|
|
|
|
|
|
|
|
|
|
|
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
|
|
|
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).build();
|
|
|
|
}catch(ImppBusiException busExcep){
|
|
|
|
}catch(ImppBusiException busExcep){
|
|
|
|
return ResultBean.fail(busExcep);
|
|
|
|
return ResultBean.fail(busExcep);
|
|
|
|
}catch(Exception e){
|
|
|
|
}catch(Exception e){
|
|
|
@ -261,7 +268,7 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
}else if(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() == status.intValue()){
|
|
|
|
}else if(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() == status.intValue()){
|
|
|
|
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).resumeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
|
|
|
|
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).resumeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return new ResultBean(true);
|
|
|
|
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
|
|
|
}catch(ImppBusiException busExcep){
|
|
|
|
}catch(ImppBusiException busExcep){
|
|
|
|
return ResultBean.fail(busExcep);
|
|
|
|
return ResultBean.fail(busExcep);
|
|
|
|
}catch(Exception e){
|
|
|
|
}catch(Exception e){
|
|
|
@ -297,7 +304,6 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
return ResultBean.fail("操作失败").setErrorMsg(baseResultBean.errorMsg);
|
|
|
|
return ResultBean.fail("操作失败").setErrorMsg(baseResultBean.errorMsg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}catch(ImppBusiException busExcep){
|
|
|
|
}catch(ImppBusiException busExcep){
|
|
|
|
return ResultBean.fail(busExcep);
|
|
|
|
return ResultBean.fail(busExcep);
|
|
|
|
}catch(Exception e){
|
|
|
|
}catch(Exception e){
|
|
|
|