|
|
|
@ -28,7 +28,6 @@ import org.slf4j.Logger;
|
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -85,16 +84,16 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
|
// 数据校验
|
|
|
|
|
ValidatorBean.beginValid(sysTaskPlan)
|
|
|
|
|
.notNull("name", sysTaskPlan.getName())
|
|
|
|
|
.notNull("groupName",sysTaskPlan.getGroupName())
|
|
|
|
|
.notNull("taskCycleId",sysTaskPlan.getTaskCycleId())
|
|
|
|
|
.notNull("taskId",sysTaskPlan.getTaskId())
|
|
|
|
|
.notNull("groupName", sysTaskPlan.getGroupName())
|
|
|
|
|
.notNull("taskCycleId", sysTaskPlan.getTaskCycleId())
|
|
|
|
|
.notNull("taskId", sysTaskPlan.getTaskId())
|
|
|
|
|
.notNull("taskMethodType", sysTaskPlan.getTaskMethodType());
|
|
|
|
|
|
|
|
|
|
SysTaskCycle sysTaskCycle = sysTaskCycleService.getSysTaskCycleById(sysTaskPlan.getTaskCycleId());
|
|
|
|
|
ValidatorBean.checkNotNull(sysTaskCycle,"任务周期不存在");
|
|
|
|
|
ValidatorBean.checkNotNull(sysTaskCycle, "任务周期不存在");
|
|
|
|
|
|
|
|
|
|
SysTask sysTask = sysTaskService.getSysTaskById(sysTaskPlan.getTaskId());
|
|
|
|
|
ValidatorBean.checkNotNull(sysTask,"任务不存在");
|
|
|
|
|
ValidatorBean.checkNotNull(sysTask, "任务不存在");
|
|
|
|
|
|
|
|
|
|
// 设置冗余信息
|
|
|
|
|
sysTaskPlan.setTaskNameRdd(sysTask.getName());
|
|
|
|
@ -107,7 +106,8 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
|
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()){
|
|
|
|
|
throw ImppExceptionBuilder.newInstance()
|
|
|
|
|
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
|
|
|
|
@ -118,7 +118,7 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
|
|
|
|
|
|
// 添加至对应模块调度器中
|
|
|
|
|
baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).addTask(sysTask.getTaskPackage(),
|
|
|
|
|
sysTask.getTaskClass(),sysTaskPlan.getName(),sysTaskPlan.getGroupName(),sysTaskCycle.getTaskCycleExps(),
|
|
|
|
|
sysTask.getTaskClass(), sysTaskPlan.getName(), sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(),
|
|
|
|
|
sysTaskPlan.getTaskPlanDescription());
|
|
|
|
|
if (!baseResultBean.isSuccess()) {
|
|
|
|
|
throw ImppExceptionBuilder.newInstance()
|
|
|
|
@ -132,7 +132,8 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
|
|
|
|
|
|
// 立即执行
|
|
|
|
|
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()) {
|
|
|
|
|
throw ImppExceptionBuilder.newInstance()
|
|
|
|
|
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
|
|
|
|
@ -149,6 +150,12 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 修改任务计划
|
|
|
|
|
* @param sysTaskPlan 任务计划对象
|
|
|
|
|
* @param isExecute 是否立即执行
|
|
|
|
|
* @return 处理结果
|
|
|
|
|
*/
|
|
|
|
|
@PutMapping(value = "/update")
|
|
|
|
|
@ApiOperation(value = "修改任务计划", notes = "任务计划")
|
|
|
|
|
public ResultBean updateSysTaskTime(SysTaskPlan sysTaskPlan, Boolean isExecute) {
|
|
|
|
@ -156,16 +163,16 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
|
// 数据校验
|
|
|
|
|
ValidatorBean.beginValid(sysTaskPlan)
|
|
|
|
|
.notNull("name", sysTaskPlan.getName())
|
|
|
|
|
.notNull("groupName",sysTaskPlan.getGroupName())
|
|
|
|
|
.notNull("taskCycleId",sysTaskPlan.getTaskCycleId())
|
|
|
|
|
.notNull("taskId",sysTaskPlan.getTaskId())
|
|
|
|
|
.notNull("groupName", sysTaskPlan.getGroupName())
|
|
|
|
|
.notNull("taskCycleId", sysTaskPlan.getTaskCycleId())
|
|
|
|
|
.notNull("taskId", sysTaskPlan.getTaskId())
|
|
|
|
|
.notNull("taskMethodType", sysTaskPlan.getTaskMethodType());
|
|
|
|
|
|
|
|
|
|
SysTaskCycle sysTaskCycle = sysTaskCycleService.getSysTaskCycleById(sysTaskPlan.getTaskCycleId());
|
|
|
|
|
ValidatorBean.checkNotNull(sysTaskCycle,"任务周期不存在");
|
|
|
|
|
ValidatorBean.checkNotNull(sysTaskCycle, "任务周期不存在");
|
|
|
|
|
|
|
|
|
|
SysTask sysTask = sysTaskService.getSysTaskById(sysTaskPlan.getTaskId());
|
|
|
|
|
ValidatorBean.checkNotNull(sysTask,"任务不存在");
|
|
|
|
|
ValidatorBean.checkNotNull(sysTask, "任务不存在");
|
|
|
|
|
|
|
|
|
|
sysTaskPlan.setTaskNameRdd(sysTask.getName());
|
|
|
|
|
sysTaskPlan.setTaskSoftTypeRdd(sysTask.getTaskSoftType());
|
|
|
|
@ -177,11 +184,11 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
|
sysTaskPlanService.updateSysTaskPlan(sysTaskPlan);
|
|
|
|
|
|
|
|
|
|
// 修改对应模块中的定时任务
|
|
|
|
|
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).editTask(sysTask.getTaskPackage(),sysTask.getTaskClass(),sysTaskPlan.getName()
|
|
|
|
|
,sysTaskPlan.getGroupName(),sysTaskCycle.getTaskCycleExps(),sysTaskPlan.getTaskPlanDescription());
|
|
|
|
|
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).editTask(sysTask.getTaskPackage(), sysTask.getTaskClass(), sysTaskPlan.getName(),
|
|
|
|
|
sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(), sysTaskPlan.getTaskPlanDescription());
|
|
|
|
|
|
|
|
|
|
if(isExecute != null && isExecute){
|
|
|
|
|
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
|
|
|
|
|
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
|
|
|
|
|
}
|
|
|
|
|
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysTaskPlan);
|
|
|
|
|
}catch(ImppBusiException busExcep){
|
|
|
|
@ -203,7 +210,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());
|
|
|
|
|
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).build();
|
|
|
|
|
}catch(ImppBusiException busExcep){
|
|
|
|
|
return ResultBean.fail(busExcep);
|
|
|
|
|
}catch(Exception e){
|
|
|
|
@ -244,7 +251,7 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
|
|
|
|
|
|
@PutMapping(value = "/status/{id}/{status}")
|
|
|
|
|
@ApiOperation(value = "修改任务计划状态", notes = "根据ID修改任务计划状态")
|
|
|
|
|
public ResultBean updateQuartzStatus(@PathVariable("id") String idStr,@PathVariable("status") Integer status) {
|
|
|
|
|
public ResultBean updateQuartzStatus(@PathVariable("id") String idStr, @PathVariable("status") Integer status) {
|
|
|
|
|
try {
|
|
|
|
|
// 数据校验
|
|
|
|
|
ValidatorBean.checkNotNull(idStr, "id 不能为空");
|
|
|
|
@ -253,15 +260,15 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
|
SysTaskPlan sysTaskPlan = sysTaskPlanService.getSysTaskPlanById(Long.parseLong(idStr));
|
|
|
|
|
ValidatorBean.checkNotNull(sysTaskPlan, "定时任务计划不存在");
|
|
|
|
|
|
|
|
|
|
sysTaskPlanService.updateSysTaskPlanStatus(Long.parseLong(idStr),status,AuthUtil.getSessionUser());
|
|
|
|
|
sysTaskPlanService.updateSysTaskPlanStatus(Long.parseLong(idStr), status ,AuthUtil.getSessionUser());
|
|
|
|
|
|
|
|
|
|
// 停止或启用对应模块中的定时任务
|
|
|
|
|
if(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == status.intValue()){
|
|
|
|
|
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).pauseJob(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
|
|
|
|
|
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).pauseJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
|
|
|
|
|
}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){
|
|
|
|
|
return ResultBean.fail(busExcep);
|
|
|
|
|
}catch(Exception e){
|
|
|
|
@ -270,10 +277,10 @@ public class SysTaskPlanController extends CoreBaseController{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@GetMapping("/query")
|
|
|
|
|
@ApiOperation(value = "任务计划复杂查询,分页,排序",notes = "任务计划复杂查询,分页,排序")
|
|
|
|
|
@ApiOperation(value = "任务计划复杂查询,分页,排序", notes = "任务计划复杂查询,分页,排序")
|
|
|
|
|
public ResultBean querySysTaskTimeByPager(SysTaskPlan taskTime, Pager pager){
|
|
|
|
|
try {
|
|
|
|
|
ListPager taskTimeListPager = sysTaskPlanService.querySysTaskPlanByPager(taskTime,pager);
|
|
|
|
|
ListPager taskTimeListPager = sysTaskPlanService.querySysTaskPlanByPager(taskTime, pager);
|
|
|
|
|
return ResultBean.success("操作成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
|
|
|
|
}catch(ImppBusiException busExcep){
|
|
|
|
|
return ResultBean.fail(busExcep);
|
|
|
|
@ -291,17 +298,16 @@ 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{
|
|
|
|
|
return ResultBean.fail("操作失败").setErrorMsg(baseResultBean.errorMsg);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}catch(ImppBusiException busExcep){
|
|
|
|
|
return ResultBean.fail(busExcep);
|
|
|
|
|
}catch(Exception e){
|
|
|
|
|
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|