添加参数默认值
This commit is contained in:
parent
c64722c910
commit
68d7678a1f
|
|
@ -7,6 +7,10 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
|
||||||
import com.ruoyi.common.security.annotation.InnerAuth;
|
import com.ruoyi.common.security.annotation.InnerAuth;
|
||||||
import com.ruoyi.task.api.domain.TaskPlanDTO;
|
import com.ruoyi.task.api.domain.TaskPlanDTO;
|
||||||
import com.ruoyi.task.api.domain.TaskPlanQueryDTO;
|
import com.ruoyi.task.api.domain.TaskPlanQueryDTO;
|
||||||
|
import com.ruoyi.task.api.enums.ExecuteTypeEnum;
|
||||||
|
import com.ruoyi.task.api.enums.PlanTypeEnum;
|
||||||
|
import com.ruoyi.task.api.enums.StatusEnum;
|
||||||
|
import com.ruoyi.task.domain.model.TaskPlan;
|
||||||
import com.ruoyi.task.service.api.ITaskPlanService;
|
import com.ruoyi.task.service.api.ITaskPlanService;
|
||||||
import com.ruoyi.task.controller.convert.TaskPlanControllerConvert;
|
import com.ruoyi.task.controller.convert.TaskPlanControllerConvert;
|
||||||
import com.ruoyi.task.controller.convert.TaskPlanQueryControllerConvert;
|
import com.ruoyi.task.controller.convert.TaskPlanQueryControllerConvert;
|
||||||
|
|
@ -14,6 +18,7 @@ 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;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 任务计划Controller
|
* 任务计划Controller
|
||||||
|
|
@ -28,12 +33,26 @@ public class TaskPlanController extends BaseController
|
||||||
@Autowired
|
@Autowired
|
||||||
private ITaskPlanService taskPlanService;
|
private ITaskPlanService taskPlanService;
|
||||||
|
|
||||||
|
private void setDefaultPlan(TaskPlanDTO plan) {
|
||||||
|
if(Objects.isNull(plan)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(Objects.isNull(plan.getExecuteType())) {
|
||||||
|
plan.setExecuteType(ExecuteTypeEnum.ONCE);
|
||||||
|
}
|
||||||
|
if(Objects.isNull(plan.getStatus())) {
|
||||||
|
plan.setStatus(StatusEnum.PENDING);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建定时任务计划
|
* 创建定时任务计划
|
||||||
*/
|
*/
|
||||||
@PostMapping("/timed")
|
@PostMapping("/timed")
|
||||||
public R<Long> createTimedTaskPlan(@RequestBody TaskPlanDTO taskPlanDTO)
|
public R<Long> createTimedTaskPlan(@RequestBody TaskPlanDTO taskPlanDTO)
|
||||||
{
|
{
|
||||||
|
taskPlanDTO.setPlanType(PlanTypeEnum.TIMED);
|
||||||
|
setDefaultPlan(taskPlanDTO);
|
||||||
Long planId = taskPlanService.createTimedTaskPlan(TaskPlanControllerConvert.to(taskPlanDTO));
|
Long planId = taskPlanService.createTimedTaskPlan(TaskPlanControllerConvert.to(taskPlanDTO));
|
||||||
return R.ok(planId);
|
return R.ok(planId);
|
||||||
}
|
}
|
||||||
|
|
@ -44,6 +63,8 @@ public class TaskPlanController extends BaseController
|
||||||
@PostMapping("/cycle")
|
@PostMapping("/cycle")
|
||||||
public R<Long> createCycleTaskPlan(@RequestBody TaskPlanDTO taskPlanDTO)
|
public R<Long> createCycleTaskPlan(@RequestBody TaskPlanDTO taskPlanDTO)
|
||||||
{
|
{
|
||||||
|
taskPlanDTO.setPlanType(PlanTypeEnum.CYCLE);
|
||||||
|
setDefaultPlan(taskPlanDTO);
|
||||||
Long planId = taskPlanService.createCycleTaskPlan(TaskPlanControllerConvert.to(taskPlanDTO));
|
Long planId = taskPlanService.createCycleTaskPlan(TaskPlanControllerConvert.to(taskPlanDTO));
|
||||||
return R.ok(planId);
|
return R.ok(planId);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue