THENG
/
a-tuoheng-task
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改参数枚举

This commit is contained in:
孙小云 2026-03-06 10:28:00 +08:00
parent 3bce0390c0
commit c500939a90
4 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/com/ruoyi/task/service/dto/TaskPlanQueryDTO.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.task.service.dto; package com.ruoyi.task.service.dto;
import com.ruoyi.task.api.enums.*;
import java.util.Date; import java.util.Date;
/** /**
@ -17,13 +18,13 @@ public class TaskPlanQueryDTO {
private String planName; private String planName;
/** 计划类型（定时任务计划、周期任务计划） */ /** 计划类型（定时任务计划、周期任务计划） */
private String planType; private PlanTypeEnum planType;
/** 执行类型（单次执行、连续执行） */ /** 执行类型（单次执行、连续执行） */
private String executeType; private ExecuteTypeEnum executeType;
/** 周期类型（日周期、周周期、月周期） */ /** 周期类型（日周期、周周期、月周期） */
private String cycleType; private CycleTypeEnum cycleType;
/** 开始日期（开始范围） */ /** 开始日期（开始范围） */
private Date startDateStart; private Date startDateStart;
@ -44,13 +45,13 @@ public class TaskPlanQueryDTO {
private Long uavId; private Long uavId;
/** 状态（0待执行 1执行中 2已完成 3已取消） */ /** 状态（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; private String airportCode;
@ -75,27 +76,27 @@ public class TaskPlanQueryDTO {
this.planName = planName; this.planName = planName;
} }
public String getPlanType() { public PlanTypeEnum getPlanType() {
return planType; return planType;
} }
public void setPlanType(String planType) { public void setPlanType(PlanTypeEnum planType) {
this.planType = planType; this.planType = planType;
} }
public String getExecuteType() { public ExecuteTypeEnum getExecuteType() {
return executeType; return executeType;
} }
public void setExecuteType(String executeType) { public void setExecuteType(ExecuteTypeEnum executeType) {
this.executeType = executeType; this.executeType = executeType;
} }
public String getCycleType() { public CycleTypeEnum getCycleType() {
return cycleType; return cycleType;
} }
public void setCycleType(String cycleType) { public void setCycleType(CycleTypeEnum cycleType) {
this.cycleType = cycleType; this.cycleType = cycleType;
} }
@ -147,27 +148,27 @@ public class TaskPlanQueryDTO {
this.uavId = uavId; this.uavId = uavId;
} }
public String getStatus() { public StatusEnum getStatus() {
return status; return status;
} }
public void setStatus(String status) { public void setStatus(StatusEnum status) {
this.status = status; this.status = status;
} }
public String getTaskCategory() { public TaskCategoryEnum getTaskCategory() {
return taskCategory; return taskCategory;
} }
public void setTaskCategory(String taskCategory) { public void setTaskCategory(TaskCategoryEnum taskCategory) {
this.taskCategory = taskCategory; this.taskCategory = taskCategory;
} }
public String getTaskType() { public TaskTypeEnum getTaskType() {
return taskType; return taskType;
} }
public void setTaskType(String taskType) { public void setTaskType(TaskTypeEnum taskType) {
this.taskType = taskType; this.taskType = taskType;
} }
@ -192,18 +193,18 @@ public class TaskPlanQueryDTO {
return "TaskPlanQueryDTO{" + return "TaskPlanQueryDTO{" +
"id=" + id + "id=" + id +
", planName='" + planName + '\'' + ", planName='" + planName + '\'' +
", planType='" + planType + '\'' + ", planType=" + planType +
", executeType='" + executeType + '\'' + ", executeType=" + executeType +
", cycleType='" + cycleType + '\'' + ", cycleType=" + cycleType +
", startDateStart=" + startDateStart + ", startDateStart=" + startDateStart +
", startDateEnd=" + startDateEnd + ", startDateEnd=" + startDateEnd +
", endDateStart=" + endDateStart + ", endDateStart=" + endDateStart +
", endDateEnd=" + endDateEnd + ", endDateEnd=" + endDateEnd +
", routeId=" + routeId + ", routeId=" + routeId +
", uavId=" + uavId + ", uavId=" + uavId +
", status='" + status + '\'' + ", status=" + status +
", taskCategory='" + taskCategory + '\'' + ", taskCategory=" + taskCategory +
", taskType='" + taskType + '\'' + ", taskType=" + taskType +
", airportCode='" + airportCode + '\'' + ", airportCode='" + airportCode + '\'' +
", routeName='" + routeName + '\'' + ", routeName='" + routeName + '\'' +
'}'; '}';

33
src/main/java/com/ruoyi/task/service/dto/TaskQueryDTO.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.task.service.dto; package com.ruoyi.task.service.dto;
import com.ruoyi.task.api.enums.*;
import java.util.Date; import java.util.Date;
/** /**
@ -20,13 +21,13 @@ public class TaskQueryDTO {
private String taskName; private String taskName;
/** 任务类别（如人工执飞） */ /** 任务类别（如人工执飞） */
private String taskCategory; private TaskCategoryEnum taskCategory;
/** 任务类型（如一键起飞） */ /** 任务类型（如一键起飞） */
private String taskType; private TaskTypeEnum taskType;
/** 执行类型（单次执行、连续执行） */ /** 执行类型（单次执行、连续执行） */
private String executeType; private ExecuteTypeEnum executeType;
/** 航线ID */ /** 航线ID */
private Long routeId; private Long routeId;
@ -35,7 +36,7 @@ public class TaskQueryDTO {
private Long uavId; private Long uavId;
/** 状态（0待执行 1执行中 2已完成 3已取消） */ /** 状态（0待执行 1执行中 2已完成 3已取消） */
private String status; private StatusEnum status;
/** 开始时间（开始范围） */ /** 开始时间（开始范围） */
private Date startTimeStart; private Date startTimeStart;
@ -80,27 +81,27 @@ public class TaskQueryDTO {
this.taskName = taskName; this.taskName = taskName;
} }
public String getTaskCategory() { public TaskCategoryEnum getTaskCategory() {
return taskCategory; return taskCategory;
} }
public void setTaskCategory(String taskCategory) { public void setTaskCategory(TaskCategoryEnum taskCategory) {
this.taskCategory = taskCategory; this.taskCategory = taskCategory;
} }
public String getTaskType() { public TaskTypeEnum getTaskType() {
return taskType; return taskType;
} }
public void setTaskType(String taskType) { public void setTaskType(TaskTypeEnum taskType) {
this.taskType = taskType; this.taskType = taskType;
} }
public String getExecuteType() { public ExecuteTypeEnum getExecuteType() {
return executeType; return executeType;
} }
public void setExecuteType(String executeType) { public void setExecuteType(ExecuteTypeEnum executeType) {
this.executeType = executeType; this.executeType = executeType;
} }
@ -120,11 +121,11 @@ public class TaskQueryDTO {
this.uavId = uavId; this.uavId = uavId;
} }
public String getStatus() { public StatusEnum getStatus() {
return status; return status;
} }
public void setStatus(String status) { public void setStatus(StatusEnum status) {
this.status = status; this.status = status;
} }
@ -182,12 +183,12 @@ public class TaskQueryDTO {
"id=" + id + "id=" + id +
", planId=" + planId + ", planId=" + planId +
", taskName='" + taskName + '\'' + ", taskName='" + taskName + '\'' +
", taskCategory='" + taskCategory + '\'' + ", taskCategory=" + taskCategory +
", taskType='" + taskType + '\'' + ", taskType=" + taskType +
", executeType='" + executeType + '\'' + ", executeType=" + executeType +
", routeId=" + routeId + ", routeId=" + routeId +
", uavId=" + uavId + ", uavId=" + uavId +
", status='" + status + '\'' + ", status=" + status +
", startTimeStart=" + startTimeStart + ", startTimeStart=" + startTimeStart +
", startTimeEnd=" + startTimeEnd + ", startTimeEnd=" + startTimeEnd +
", endTimeStart=" + endTimeStart + ", endTimeStart=" + endTimeStart +

4
src/main/java/com/ruoyi/task/service/impl/TaskPlanServiceImpl.java
View File

@ -188,8 +188,8 @@ public class TaskPlanServiceImpl implements ITaskPlanService {
// 创建TaskPlan对象作为查询条件 // 创建TaskPlan对象作为查询条件
TaskPlan taskPlan = new TaskPlan(); TaskPlan taskPlan = new TaskPlan();
taskPlan.setRouteId(queryDTO.getRouteId()); taskPlan.setRouteId(queryDTO.getRouteId());
taskPlan.setStatus(StatusEnum.getByCode(queryDTO.getStatus())); taskPlan.setStatus(queryDTO.getStatus());
taskPlan.setPlanType(PlanTypeEnum.getByCode(queryDTO.getPlanType())); taskPlan.setPlanType(queryDTO.getPlanType());
List<TaskPlan> taskPlans = taskPlanDomain.getTaskPlanList(taskPlan); List<TaskPlan> taskPlans = taskPlanDomain.getTaskPlanList(taskPlan);
return TaskPlanDTOConvert.toDTOList(taskPlans); return TaskPlanDTOConvert.toDTOList(taskPlans);

6
src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java
View File

@ -38,9 +38,9 @@ public class TaskServiceImpl implements ITaskService {
// 创建Task对象作为查询条件 // 创建Task对象作为查询条件
Task task = new Task(); Task task = new Task();
task.setRouteId(queryDTO.getRouteId()); task.setRouteId(queryDTO.getRouteId());
task.setStatus(StatusEnum.getByCode(queryDTO.getStatus())); task.setStatus(queryDTO.getStatus());
task.setTaskCategory(TaskCategoryEnum.getByCode(queryDTO.getTaskCategory())); task.setTaskCategory(queryDTO.getTaskCategory());
task.setTaskType(TaskTypeEnum.getByCode(queryDTO.getTaskType())); task.setTaskType(queryDTO.getTaskType());
List<Task> tasks = taskDomain.getTaskList(task); List<Task> tasks = taskDomain.getTaskList(task);
return TaskDTOConvert.toDTOList(tasks); return TaskDTOConvert.toDTOList(tasks);