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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
gyb 2026-03-12 14:17:33 +08:00
parent b3fd1019f9 174bedac08
commit 77202deb58
5 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java
View File

@ -90,4 +90,7 @@ public class DockWithGPSVO implements Serializable {
@Schema(description = "充放电状态")
private String chargingStatus;
@Schema(description = "无人机SN号")
private String snNumber;
}

14
ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/ExecuteTypeEnum.java
View File

@ -1,5 +1,8 @@
package com.ruoyi.task.api.enums;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
public enum ExecuteTypeEnum {
ONCE("once", "单次执行"),
CONTINUOUS("continuous", "连续执行");
@ -12,6 +15,7 @@ public enum ExecuteTypeEnum {
this.name = name;
}
@JsonValue
public String getCode() {
return code;
}
@ -20,12 +24,16 @@ public enum ExecuteTypeEnum {
return name;
}
public static ExecuteTypeEnum getByCode(String code) {
@JsonCreator
public static ExecuteTypeEnum getByCode(String value) {
if (value == null || value.isEmpty()) {
return null;
}
for (ExecuteTypeEnum type : values()) {
if (type.code.equals(code)) {
if (type.code.equals(value) || type.name().equals(value)) {
return type;
}
}
return null;
}
}
}

14
ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/StatusEnum.java
View File

@ -1,5 +1,8 @@
package com.ruoyi.task.api.enums;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
public enum StatusEnum {
PENDING("pending", "待执行"),
RUNNING("running", "执行中"),
@ -15,6 +18,7 @@ public enum StatusEnum {
this.name = name;
}
@JsonValue
public String getCode() {
return code;
}
@ -23,12 +27,16 @@ public enum StatusEnum {
return name;
}
public static StatusEnum getByCode(String code) {
@JsonCreator
public static StatusEnum getByCode(String value) {
if (value == null || value.isEmpty()) {
return null;
}
for (StatusEnum status : values()) {
if (status.code.equals(code)) {
if (status.code.equals(value) || status.name().equals(value)) {
return status;
}
}
return null;
}
}
}

14
ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/TaskCategoryEnum.java
View File

@ -1,5 +1,8 @@
package com.ruoyi.task.api.enums;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
public enum TaskCategoryEnum {
MANUAL_FLIGHT("manual_flight", "人工执飞"),
PLAN_TASK("plan_task", "计划任务"),
@ -13,6 +16,7 @@ public enum TaskCategoryEnum {
this.name = name;
}
@JsonValue
public String getCode() {
return code;
}
@ -21,12 +25,16 @@ public enum TaskCategoryEnum {
return name;
}
public static TaskCategoryEnum getByCode(String code) {
@JsonCreator
public static TaskCategoryEnum getByCode(String value) {
if (value == null || value.isEmpty()) {
return null;
}
for (TaskCategoryEnum category : values()) {
if (category.code.equals(code)) {
if (category.code.equals(value) || category.name().equals(value)) {
return category;
}
}
return null;
}
}
}

7
ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/TaskTypeEnum.java
View File

@ -26,9 +26,12 @@ public enum TaskTypeEnum {
}
@JsonCreator
public static TaskTypeEnum getByCode(String code) {
public static TaskTypeEnum getByCode(String value) {
if (value == null || value.isEmpty()) {
return null;
}
for (TaskTypeEnum type : values()) {
if (type.code.equals(code)) {
if (type.code.equals(value) || type.name().equals(value)) {
return type;
}
}