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

Compare commits

base: THENG:7e17d1e8efc82fee1c6f010a756acbdc6b29d771
Branches Tags
THENG:main
THENG:dev
THENG:f_deploy
THENG:test
THENG:f_add_shuxing
..
compare: THENG:e942018c3fcea7f976b82aee000ad77ce93999d9
Branches Tags
THENG:dev
THENG:f_deploy
THENG:test
THENG:f_add_shuxing
THENG:main

No commits in common. "7e17d1e8efc82fee1c6f010a756acbdc6b29d771" and "e942018c3fcea7f976b82aee000ad77ce93999d9" have entirely different histories.
7e17d1e8ef ... e942018c3f

8 changed files with 15 additions and 29 deletions
Show Stats Expand all files Collapse all files

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

@ -46,8 +46,7 @@ public class AircraftVO implements Serializable {
private String aircraftModel; private String aircraftModel;
/** 无人机状态 */ /** 无人机状态 */
@Schema(description = "无人机状态: POWER_ON_IN_CABIN-舱内开机, POWER_OFF_IN_CABIN-舱内关机, POWER_ON_OUT_CABIN-舱外开机, POWER_OFF_OUT_CABIN-舱外关机, IN_MISSION-任务中, DEBUGGING-调试, OFFLINE-离线", @Schema(description = "无人机状态：POWER_ON_IN_CABIN-舱内开机, POWER_OFF_IN_CABIN-舱内关机, POWER_ON_OUT_CABIN-舱外开机, POWER_OFF_OUT_CABIN-舱外关机, IN_MISSION-任务中, DEBUGGING-调试, OFFLINE-离线")
allowableValues = {"POWER_ON_IN_CABIN", "POWER_OFF_IN_CABIN", "POWER_ON_OUT_CABIN", "POWER_OFF_OUT_CABIN", "IN_MISSION", "DEBUGGING", "OFFLINE"})
@Excel(name = "无人机状态") @Excel(name = "无人机状态")
private String aircraftStatus; private String aircraftStatus;

15
ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockDetailVO.java
View File

@ -114,8 +114,7 @@ public class DockDetailVO extends DockVO {
/** /**
* 网络类型 * 网络类型
*/ */
@Schema(description = "网络类型: FOUR_G-4G, ETHERNET-以太网, WIRED-有线, FIVE_G-5G, TWO_POINT_FOUR_G-2.4G", @Schema(description = "网络类型")
allowableValues = {"FOUR_G", "ETHERNET", "WIRED", "FIVE_G", "TWO_POINT_FOUR_G"})
@Excel(name = "网络类型") @Excel(name = "网络类型")
private String networkType; private String networkType;
@ -147,8 +146,7 @@ public class DockDetailVO extends DockVO {
/** /**
* 机场状态 * 机场状态
*/ */
@Schema(description = "机场运行状态: IDLE-空闲中, Debugging-现场调试/远程调试, Upgrading-固件升级中, Working-作业中, UNKNOWN-待标定, OFFLINE-离线", @Schema(description = "机场运行状态")
allowableValues = {"IDLE", "Debugging", "Upgrading", "Working", "UNKNOWN", "OFFLINE"})
@Excel(name = "机场运行状态") @Excel(name = "机场运行状态")
private String dockRunStatus; private String dockRunStatus;
@ -190,24 +188,21 @@ public class DockDetailVO extends DockVO {
/** /**
* 升降架位置 * 升降架位置
*/ */
@Schema(description = "升降架位置: BOTTOM-底部, TOP-顶部", @Schema(description = "升降架位置")
allowableValues = {"BOTTOM", "TOP"})
@Excel(name = "升降架位置") @Excel(name = "升降架位置")
private String elevatorPosition; private String elevatorPosition;
/** /**
* X轴夹状态 * X轴夹状态
*/ */
@Schema(description = "X轴夹状态: OPEN-开启, CLOSE-关闭", @Schema(description = "X轴夹状态")
allowableValues = {"OPEN", "CLOSE"})
@Excel(name = "X轴夹状态") @Excel(name = "X轴夹状态")
private String xAxisClampStatus; private String xAxisClampStatus;
/** /**
* Y轴夹状态 * Y轴夹状态
*/ */
@Schema(description = "Y轴夹状态: OPEN-开启, CLOSE-关闭", @Schema(description = "Y轴夹状态")
allowableValues = {"OPEN", "CLOSE"})
@Excel(name = "Y轴夹状态") @Excel(name = "Y轴夹状态")
private String yAxisClampStatus; private String yAxisClampStatus;

6
ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockVO.java
View File

@ -51,8 +51,7 @@ public class DockVO implements Serializable {
private String dockModel; private String dockModel;
/** 机场状态 */ /** 机场状态 */
@Schema(description = "机场状态: IDLE-空闲中, Debugging-现场调试/远程调试, Upgrading-固件升级中, Working-作业中, UNKNOWN-待标定, OFFLINE-离线", @Schema(description = "机场状态：IDLE-空闲中, Debugging-调试, Upgrading-固件升级中, Working-作业中, UNKNOWN-待标定, OFFLINE-离线")
allowableValues = {"IDLE", "Debugging", "Upgrading", "Working", "UNKNOWN", "OFFLINE"})
@Excel(name = "机场状态") @Excel(name = "机场状态")
private String dockStatus; private String dockStatus;
@ -82,8 +81,7 @@ public class DockVO implements Serializable {
private String aircraftModel; private String aircraftModel;
/** 无人机状态 */ /** 无人机状态 */
@Schema(description = "无人机状态: POWER_ON_IN_CABIN-舱内开机, POWER_OFF_IN_CABIN-舱内关机, POWER_ON_OUT_CABIN-舱外开机, POWER_OFF_OUT_CABIN-舱外关机, IN_MISSION-任务中, DEBUGGING-调试, OFFLINE-离线", @Schema(description = "无人机状态：POWER_ON_IN_CABIN-舱内开机, POWER_OFF_IN_CABIN-舱内关机, POWER_ON_OUT_CABIN-舱外开机, POWER_OFF_OUT_CABIN-舱外关机, IN_MISSION-任务中, DEBUGGING-调试, OFFLINE-离线")
allowableValues = {"POWER_ON_IN_CABIN", "POWER_OFF_IN_CABIN", "POWER_ON_OUT_CABIN", "POWER_OFF_OUT_CABIN", "IN_MISSION", "DEBUGGING", "OFFLINE"})
@Excel(name = "无人机状态") @Excel(name = "无人机状态")
private String aircraftStatus; private String aircraftStatus;

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

@ -43,8 +43,7 @@ public class DockWithGPSVO implements Serializable {
@Excel(name = "机场型号") @Excel(name = "机场型号")
private String dockModel; private String dockModel;
@Schema(description = "机场状态: IDLE-空闲中, Debugging-现场调试/远程调试, Upgrading-固件升级中, Working-作业中, UNKNOWN-待标定, OFFLINE-离线", @Schema(description = "机场状态：IDLE-空闲中, Debugging-调试, Upgrading-固件升级中, Working-作业中, UNKNOWN-待标定, OFFLINE-离线")
allowableValues = {"IDLE", "Debugging", "Upgrading", "Working", "UNKNOWN", "OFFLINE"})
@Excel(name = "机场状态") @Excel(name = "机场状态")
private String dockStatus; private String dockStatus;
@ -68,8 +67,7 @@ public class DockWithGPSVO implements Serializable {
@Excel(name = "无人机型号") @Excel(name = "无人机型号")
private String aircraftModel; private String aircraftModel;
@Schema(description = "无人机状态: POWER_ON_IN_CABIN-舱内开机, POWER_OFF_IN_CABIN-舱内关机, POWER_ON_OUT_CABIN-舱外开机, POWER_OFF_OUT_CABIN-舱外关机, IN_MISSION-任务中, DEBUGGING-调试, OFFLINE-离线", @Schema(description = "无人机状态：POWER_ON_IN_CABIN-舱内开机, POWER_OFF_IN_CABIN-舱内关机, POWER_ON_OUT_CABIN-舱外开机, POWER_OFF_OUT_CABIN-舱外关机, IN_MISSION-任务中, DEBUGGING-调试, OFFLINE-离线")
allowableValues = {"POWER_ON_IN_CABIN", "POWER_OFF_IN_CABIN", "POWER_ON_OUT_CABIN", "POWER_OFF_OUT_CABIN", "IN_MISSION", "DEBUGGING", "OFFLINE"})
@Excel(name = "无人机状态") @Excel(name = "无人机状态")
private String aircraftStatus; private String aircraftStatus;

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

@ -20,8 +20,7 @@ public class NetworkVO implements Serializable
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 网络类型 */ /** 网络类型 */
@Schema(description = "网络类型: FOUR_G-4G, ETHERNET-以太网, WIRED-有线, FIVE_G-5G, TWO_POINT_FOUR_G-2.4G", @Schema(description = "网络类型")
allowableValues = {"FOUR_G", "ETHERNET", "WIRED", "FIVE_G", "TWO_POINT_FOUR_G"})
@Excel(name = "网络类型") @Excel(name = "网络类型")
private String networkType; private String networkType;

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

@ -20,8 +20,7 @@ public class PayloadDetailVO implements Serializable
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 挂载类型 */ /** 挂载类型 */
@Schema(description = "挂载类型: SPEAKER-喊话器, CAMERA-相机, OTHER-其他", @Schema(description = "挂载类型")
allowableValues = {"SPEAKER", "CAMERA", "OTHER"})
@Excel(name = "挂载类型") @Excel(name = "挂载类型")
private String payloadType; private String payloadType;

6
ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadVO.java
View File

@ -30,14 +30,12 @@ public class PayloadVO implements Serializable
private String payloadName; private String payloadName;
/** 挂载类型 */ /** 挂载类型 */
@Schema(description = "挂载类型: SPEAKER-喊话器, CAMERA-相机, OTHER-其他", @Schema(description = "挂载类型")
allowableValues = {"SPEAKER", "CAMERA", "OTHER"})
@Excel(name = "挂载类型") @Excel(name = "挂载类型")
private String payloadType; private String payloadType;
/** 挂载状态 */ /** 挂载状态 */
@Schema(description = "挂载状态: ONLINE-在线, OFFLINE-离线", @Schema(description = "挂载状态：ONLINE-在线, OFFLINE-离线")
allowableValues = {"ONLINE", "OFFLINE"})
@Excel(name = "挂载状态") @Excel(name = "挂载状态")
private String payloadStatus; private String payloadStatus;

2
ruoyi-modules/tuoheng-device

@ -1 +1 @@
Subproject commit 1cf82176a79864bccb39122a68dc455f28b4a9c5 Subproject commit 603b62cf212313eb63355c9562457d5975f5bafc