修改参数枚举
This commit is contained in:
孙小云
parent
3bce0390c0
commit
c500939a90
|
|
@ -1,5 +1,6 @@
|
|||
package com.ruoyi.task.service.dto;
|
||||
|
||||
import com.ruoyi.task.api.enums.*;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
|
|
@ -17,13 +18,13 @@ public class TaskPlanQueryDTO {
|
|||
private String planName;
|
||||
|
||||
/** 计划类型（定时任务计划、周期任务计划） */
|
||||
private String planType;
|
||||
private PlanTypeEnum planType;
|
||||
|
||||
/** 执行类型（单次执行、连续执行） */
|
||||
private String executeType;
|
||||
private ExecuteTypeEnum executeType;
|
||||
|
||||
/** 周期类型（日周期、周周期、月周期） */
|
||||
private String cycleType;
|
||||
private CycleTypeEnum cycleType;
|
||||
|
||||
/** 开始日期（开始范围） */
|
||||
private Date startDateStart;
|
||||
|
|
@ -44,13 +45,13 @@ public class TaskPlanQueryDTO {
|
|||
private Long uavId;
|
||||
|
||||
/** 状态（0待执行 1执行中 2已完成 3已取消） */
|
||||
private String status;
|
||||
private StatusEnum status;
|
||||
|
||||
/** 任务类别 */
|
||||
private String taskCategory;
|
||||
private TaskCategoryEnum taskCategory;
|
||||
|
||||
/** 任务类型 */
|
||||
private String taskType;
|
||||
private TaskTypeEnum taskType;
|
||||
|
||||
/** 机场代码 */
|
||||
private String airportCode;
|
||||
|
|
@ -75,27 +76,27 @@ public class TaskPlanQueryDTO {
|
|||
this.planName = planName;
|
||||
}
|
||||
|
||||
public String getPlanType() {
|
||||
public PlanTypeEnum getPlanType() {
|
||||
return planType;
|
||||
}
|
||||
|
||||
public void setPlanType(String planType) {
|
||||
public void setPlanType(PlanTypeEnum planType) {
|
||||
this.planType = planType;
|
||||
}
|
||||
|
||||
public String getExecuteType() {
|
||||
public ExecuteTypeEnum getExecuteType() {
|
||||
return executeType;
|
||||
}
|
||||
|
||||
public void setExecuteType(String executeType) {
|
||||
public void setExecuteType(ExecuteTypeEnum executeType) {
|
||||
this.executeType = executeType;
|
||||
}
|
||||
|
||||
public String getCycleType() {
|
||||
public CycleTypeEnum getCycleType() {
|
||||
return cycleType;
|
||||
}
|
||||
|
||||
public void setCycleType(String cycleType) {
|
||||
public void setCycleType(CycleTypeEnum cycleType) {
|
||||
this.cycleType = cycleType;
|
||||
}
|
||||
|
||||
|
|
@ -147,27 +148,27 @@ public class TaskPlanQueryDTO {
|
|||
this.uavId = uavId;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
public StatusEnum getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
public void setStatus(StatusEnum status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getTaskCategory() {
|
||||
public TaskCategoryEnum getTaskCategory() {
|
||||
return taskCategory;
|
||||
}
|
||||
|
||||
public void setTaskCategory(String taskCategory) {
|
||||
public void setTaskCategory(TaskCategoryEnum taskCategory) {
|
||||
this.taskCategory = taskCategory;
|
||||
}
|
||||
|
||||
public String getTaskType() {
|
||||
public TaskTypeEnum getTaskType() {
|
||||
return taskType;
|
||||
}
|
||||
|
||||
public void setTaskType(String taskType) {
|
||||
public void setTaskType(TaskTypeEnum taskType) {
|
||||
this.taskType = taskType;
|
||||
}
|
||||
|
||||
|
|
@ -192,18 +193,18 @@ public class TaskPlanQueryDTO {
|
|||
return "TaskPlanQueryDTO{" +
|
||||
"id=" + id +
|
||||
", planName='" + planName + '\'' +
|
||||
", planType='" + planType + '\'' +
|
||||
", executeType='" + executeType + '\'' +
|
||||
", cycleType='" + cycleType + '\'' +
|
||||
", planType=" + planType +
|
||||
", executeType=" + executeType +
|
||||
", cycleType=" + cycleType +
|
||||
", startDateStart=" + startDateStart +
|
||||
", startDateEnd=" + startDateEnd +
|
||||
", endDateStart=" + endDateStart +
|
||||
", endDateEnd=" + endDateEnd +
|
||||
", routeId=" + routeId +
|
||||
", uavId=" + uavId +
|
||||
", status='" + status + '\'' +
|
||||
", taskCategory='" + taskCategory + '\'' +
|
||||
", taskType='" + taskType + '\'' +
|
||||
", status=" + status +
|
||||
", taskCategory=" + taskCategory +
|
||||
", taskType=" + taskType +
|
||||
", airportCode='" + airportCode + '\'' +
|
||||
", routeName='" + routeName + '\'' +
|
||||
'}';
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.ruoyi.task.service.dto;
|
||||
|
||||
import com.ruoyi.task.api.enums.*;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
|
|
@ -20,13 +21,13 @@ public class TaskQueryDTO {
|
|||
private String taskName;
|
||||
|
||||
/** 任务类别（如人工执飞） */
|
||||
private String taskCategory;
|
||||
private TaskCategoryEnum taskCategory;
|
||||
|
||||
/** 任务类型（如一键起飞） */
|
||||
private String taskType;
|
||||
private TaskTypeEnum taskType;
|
||||
|
||||
/** 执行类型（单次执行、连续执行） */
|
||||
private String executeType;
|
||||
private ExecuteTypeEnum executeType;
|
||||
|
||||
/** 航线ID */
|
||||
private Long routeId;
|
||||
|
|
@ -35,7 +36,7 @@ public class TaskQueryDTO {
|
|||
private Long uavId;
|
||||
|
||||
/** 状态（0待执行 1执行中 2已完成 3已取消） */
|
||||
private String status;
|
||||
private StatusEnum status;
|
||||
|
||||
/** 开始时间（开始范围） */
|
||||
private Date startTimeStart;
|
||||
|
|
@ -80,27 +81,27 @@ public class TaskQueryDTO {
|
|||
this.taskName = taskName;
|
||||
}
|
||||
|
||||
public String getTaskCategory() {
|
||||
public TaskCategoryEnum getTaskCategory() {
|
||||
return taskCategory;
|
||||
}
|
||||
|
||||
public void setTaskCategory(String taskCategory) {
|
||||
public void setTaskCategory(TaskCategoryEnum taskCategory) {
|
||||
this.taskCategory = taskCategory;
|
||||
}
|
||||
|
||||
public String getTaskType() {
|
||||
public TaskTypeEnum getTaskType() {
|
||||
return taskType;
|
||||
}
|
||||
|
||||
public void setTaskType(String taskType) {
|
||||
public void setTaskType(TaskTypeEnum taskType) {
|
||||
this.taskType = taskType;
|
||||
}
|
||||
|
||||
public String getExecuteType() {
|
||||
public ExecuteTypeEnum getExecuteType() {
|
||||
return executeType;
|
||||
}
|
||||
|
||||
public void setExecuteType(String executeType) {
|
||||
public void setExecuteType(ExecuteTypeEnum executeType) {
|
||||
this.executeType = executeType;
|
||||
}
|
||||
|
||||
|
|
@ -120,11 +121,11 @@ public class TaskQueryDTO {
|
|||
this.uavId = uavId;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
public StatusEnum getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
public void setStatus(StatusEnum status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
|
|
@ -182,12 +183,12 @@ public class TaskQueryDTO {
|
|||
"id=" + id +
|
||||
", planId=" + planId +
|
||||
", taskName='" + taskName + '\'' +
|
||||
", taskCategory='" + taskCategory + '\'' +
|
||||
", taskType='" + taskType + '\'' +
|
||||
", executeType='" + executeType + '\'' +
|
||||
", taskCategory=" + taskCategory +
|
||||
", taskType=" + taskType +
|
||||
", executeType=" + executeType +
|
||||
", routeId=" + routeId +
|
||||
", uavId=" + uavId +
|
||||
", status='" + status + '\'' +
|
||||
", status=" + status +
|
||||
", startTimeStart=" + startTimeStart +
|
||||
", startTimeEnd=" + startTimeEnd +
|
||||
", endTimeStart=" + endTimeStart +
|
||||
|
|
|
|||
|
|
@ -188,8 +188,8 @@ public class TaskPlanServiceImpl implements ITaskPlanService {
|
|||
// 创建TaskPlan对象作为查询条件
|
||||
TaskPlan taskPlan = new TaskPlan();
|
||||
taskPlan.setRouteId(queryDTO.getRouteId());
|
||||
taskPlan.setStatus(StatusEnum.getByCode(queryDTO.getStatus()));
|
||||
taskPlan.setPlanType(PlanTypeEnum.getByCode(queryDTO.getPlanType()));
|
||||
taskPlan.setStatus(queryDTO.getStatus());
|
||||
taskPlan.setPlanType(queryDTO.getPlanType());
|
||||
|
||||
List<TaskPlan> taskPlans = taskPlanDomain.getTaskPlanList(taskPlan);
|
||||
return TaskPlanDTOConvert.toDTOList(taskPlans);
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ public class TaskServiceImpl implements ITaskService {
|
|||
// 创建Task对象作为查询条件
|
||||
Task task = new Task();
|
||||
task.setRouteId(queryDTO.getRouteId());
|
||||
task.setStatus(StatusEnum.getByCode(queryDTO.getStatus()));
|
||||
task.setTaskCategory(TaskCategoryEnum.getByCode(queryDTO.getTaskCategory()));
|
||||
task.setTaskType(TaskTypeEnum.getByCode(queryDTO.getTaskType()));
|
||||
task.setStatus(queryDTO.getStatus());
|
||||
task.setTaskCategory(queryDTO.getTaskCategory());
|
||||
task.setTaskType(queryDTO.getTaskType());
|
||||
|
||||
List<Task> tasks = taskDomain.getTaskList(task);
|
||||
return TaskDTOConvert.toDTOList(tasks);
|
||||
|
|
|
|||
Loading…
Reference in New Issue