From 49c79f641b53a06d1873914a9e9b5051b57eb769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Wed, 21 Jan 2026 15:37:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-api/tuoheng-api-device/pom.xml | 5 + .../device/api/domain/AircraftDetailVO.java | 263 +--------- .../ruoyi/device/api/domain/AircraftVO.java | 85 +--- .../ruoyi/device/api/domain/DockDetailVO.java | 477 ++++-------------- .../com/ruoyi/device/api/domain/DockVO.java | 97 +--- .../device/api/domain/GroupCreateRequest.java | 19 +- .../com/ruoyi/device/api/domain/GroupVO.java | 41 +- .../ruoyi/device/api/domain/NetworkVO.java | 30 +- .../device/api/domain/PayloadDetailVO.java | 51 +- .../ruoyi/device/api/domain/PayloadVO.java | 51 +- .../api/domain/SwitchDockGroupRequest.java | 30 +- ruoyi-modules/tuoheng-device | 2 +- 12 files changed, 126 insertions(+), 1025 deletions(-) diff --git a/ruoyi-api/tuoheng-api-device/pom.xml b/ruoyi-api/tuoheng-api-device/pom.xml index 38d736f..1633a34 100644 --- a/ruoyi-api/tuoheng-api-device/pom.xml +++ b/ruoyi-api/tuoheng-api-device/pom.xml @@ -22,6 +22,11 @@ com.ruoyi ruoyi-common-core + + org.projectlombok + lombok + provided + diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftDetailVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftDetailVO.java index c9626a6..9b92c7b 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftDetailVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftDetailVO.java @@ -2,6 +2,8 @@ package com.ruoyi.device.api.domain; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; + import java.util.List; /** @@ -10,6 +12,7 @@ import java.util.List; * @author ruoyi * @date 2026-01-20 */ +@Data public class AircraftDetailVO extends BaseEntity { private static final long serialVersionUID = 1L; @@ -116,265 +119,5 @@ public class AircraftDetailVO extends BaseEntity @Excel(name = "循环次数") private Integer cycleCount; - // ========== Getter and Setter 方法 ========== - public Long getAircraftId() - { - return aircraftId; - } - - public void setAircraftId(Long aircraftId) - { - this.aircraftId = aircraftId; - } - - public String getAircraftIotId() - { - return aircraftIotId; - } - - public void setAircraftIotId(String aircraftIotId) - { - this.aircraftIotId = aircraftIotId; - } - - public String getManufacturerName() - { - return manufacturerName; - } - - public void setManufacturerName(String manufacturerName) - { - this.manufacturerName = manufacturerName; - } - - public String getAircraftModel() - { - return aircraftModel; - } - - public void setAircraftModel(String aircraftModel) - { - this.aircraftModel = aircraftModel; - } - - public String getAircraftVersion() - { - return aircraftVersion; - } - - public void setAircraftVersion(String aircraftVersion) - { - this.aircraftVersion = aircraftVersion; - } - - public String getSnNumber() - { - return snNumber; - } - - public void setSnNumber(String snNumber) - { - this.snNumber = snNumber; - } - - public String getBatterySn() - { - return batterySn; - } - - public void setBatterySn(String batterySn) - { - this.batterySn = batterySn; - } - - public Long getBindTime() - { - return bindTime; - } - - public void setBindTime(Long bindTime) - { - this.bindTime = bindTime; - } - - public Integer getMaintenanceDays() - { - return maintenanceDays; - } - - public void setMaintenanceDays(Integer maintenanceDays) - { - this.maintenanceDays = maintenanceDays; - } - - public String getAircraftName() - { - return aircraftName; - } - - public void setAircraftName(String aircraftName) - { - this.aircraftName = aircraftName; - } - - public String getAircraftStatus() - { - return aircraftStatus; - } - - public void setAircraftStatus(String aircraftStatus) - { - this.aircraftStatus = aircraftStatus; - } - - public Integer getFlightDuration() - { - return flightDuration; - } - - public void setFlightDuration(Integer flightDuration) - { - this.flightDuration = flightDuration; - } - - public Integer getMissionCount() - { - return missionCount; - } - - public void setMissionCount(Integer missionCount) - { - this.missionCount = missionCount; - } - - public List getPayloadList() - { - return payloadList; - } - - public void setPayloadList(List payloadList) - { - this.payloadList = payloadList; - } - - public List getNetworkList() - { - return networkList; - } - - public void setNetworkList(List networkList) - { - this.networkList = networkList; - } - - public Double getRtkSignal() - { - return rtkSignal; - } - - public void setRtkSignal(Double rtkSignal) - { - this.rtkSignal = rtkSignal; - } - - public Integer getMaxAltitude() - { - return maxAltitude; - } - - public void setMaxAltitude(Integer maxAltitude) - { - this.maxAltitude = maxAltitude; - } - - public Integer getMaxDistance() - { - return maxDistance; - } - - public void setMaxDistance(Integer maxDistance) - { - this.maxDistance = maxDistance; - } - - public Double getVoltage() - { - return voltage; - } - - public void setVoltage(Double voltage) - { - this.voltage = voltage; - } - - public Integer getBatteryLevel() - { - return batteryLevel; - } - - public void setBatteryLevel(Integer batteryLevel) - { - this.batteryLevel = batteryLevel; - } - - public Double getFlightTimeRemaining() - { - return flightTimeRemaining; - } - - public void setFlightTimeRemaining(Double flightTimeRemaining) - { - this.flightTimeRemaining = flightTimeRemaining; - } - - public Double getBatteryTemperature() - { - return batteryTemperature; - } - - public void setBatteryTemperature(Double batteryTemperature) - { - this.batteryTemperature = batteryTemperature; - } - - public Integer getCycleCount() - { - return cycleCount; - } - - public void setCycleCount(Integer cycleCount) - { - this.cycleCount = cycleCount; - } - - @Override - public String toString() - { - return "AircraftDetailVO{" + - "aircraftId=" + aircraftId + - ", aircraftIotId='" + aircraftIotId + '\'' + - ", manufacturerName='" + manufacturerName + '\'' + - ", aircraftModel='" + aircraftModel + '\'' + - ", aircraftVersion='" + aircraftVersion + '\'' + - ", snNumber='" + snNumber + '\'' + - ", batterySn='" + batterySn + '\'' + - ", bindTime=" + bindTime + - ", maintenanceDays=" + maintenanceDays + - ", aircraftName='" + aircraftName + '\'' + - ", aircraftStatus='" + aircraftStatus + '\'' + - ", flightDuration=" + flightDuration + - ", missionCount=" + missionCount + - ", payloadList=" + payloadList + - ", networkList=" + networkList + - ", rtkSignal=" + rtkSignal + - ", maxAltitude=" + maxAltitude + - ", maxDistance=" + maxDistance + - ", voltage=" + voltage + - ", batteryLevel=" + batteryLevel + - ", flightTimeRemaining=" + flightTimeRemaining + - ", batteryTemperature=" + batteryTemperature + - ", cycleCount=" + cycleCount + - '}'; - } } diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftVO.java index b5e1d5a..24b370d 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftVO.java @@ -2,6 +2,8 @@ package com.ruoyi.device.api.domain; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; + import java.util.List; /** @@ -10,6 +12,7 @@ import java.util.List; * @author ruoyi * @date 2026-01-20 */ +@Data public class AircraftVO extends BaseEntity { private static final long serialVersionUID = 1L; @@ -41,87 +44,5 @@ public class AircraftVO extends BaseEntity /** 挂载列表 */ private List payloadList; - public Long getAircraftId() - { - return aircraftId; - } - public void setAircraftId(Long aircraftId) - { - this.aircraftId = aircraftId; - } - - public String getAircraftIotId() - { - return aircraftIotId; - } - - public void setAircraftIotId(String aircraftIotId) - { - this.aircraftIotId = aircraftIotId; - } - - public String getAircraftName() - { - return aircraftName; - } - - public void setAircraftName(String aircraftName) - { - this.aircraftName = aircraftName; - } - - public String getAircraftManufacturer() - { - return aircraftManufacturer; - } - - public void setAircraftManufacturer(String aircraftManufacturer) - { - this.aircraftManufacturer = aircraftManufacturer; - } - - public String getAircraftModel() - { - return aircraftModel; - } - - public void setAircraftModel(String aircraftModel) - { - this.aircraftModel = aircraftModel; - } - - public String getAircraftStatus() - { - return aircraftStatus; - } - - public void setAircraftStatus(String aircraftStatus) - { - this.aircraftStatus = aircraftStatus; - } - - public List getPayloadList() - { - return payloadList; - } - - public void setPayloadList(List payloadList) - { - this.payloadList = payloadList; - } - - @Override - public String toString() - { - return "AircraftVO{" + - "aircraftId=" + aircraftId + - ", aircraftIotId='" + aircraftIotId + '\'' + - ", aircraftName='" + aircraftName + '\'' + - ", aircraftManufacturer='" + aircraftManufacturer + '\'' + - ", aircraftModel='" + aircraftModel + '\'' + - ", aircraftStatus='" + aircraftStatus + '\'' + - ", payloadList=" + payloadList + - '}'; - } } diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockDetailVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockDetailVO.java index c3183d4..5b8f492 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockDetailVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockDetailVO.java @@ -2,6 +2,7 @@ package com.ruoyi.device.api.domain; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; /** * 机场详情VO对象 @@ -9,491 +10,205 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi * @date 2026-01-20 */ -public class DockDetailVO extends BaseEntity -{ +@Data +public class DockDetailVO extends BaseEntity { private static final long serialVersionUID = 1L; // ========== 基本信息区域 ========== - /** 机场ID */ + /** + * 机场ID + */ @Excel(name = "机场ID") private Long dockId; - /** 机场IOT ID */ + /** + * 机场IOT ID + */ @Excel(name = "机场IOT ID") private String dockIotId; - /** 厂商名称 */ + /** + * 厂商名称 + */ @Excel(name = "厂商名称") private String manufacturerName; - /** 机场型号 */ + /** + * 机场型号 + */ @Excel(name = "机场型号") private String dockModel; - /** 固件版本 */ + /** + * 固件版本 + */ @Excel(name = "固件版本") private String firmwareVersion; - /** SN号 */ + /** + * SN号 + */ @Excel(name = "SN号") private String snNumber; - /** 绑定时间 */ + /** + * 绑定时间 + */ @Excel(name = "绑定时间") private Long bindTime; - /** 运维剩余天数 */ + /** + * 运维剩余天数 + */ @Excel(name = "运维剩余天数") private Integer maintenanceDays; // ========== 运行信息区域 ========== - /** 机场名称 */ + /** + * 机场名称 + */ @Excel(name = "机场名称") private String dockName; - /** 机场状态 */ + /** + * 机场状态 + */ @Excel(name = "机场状态") private String dockStatus; - /** 备降点坐标（经度） */ + /** + * 备降点坐标（经度） + */ @Excel(name = "备降点经度") private Double backupLongitude; - /** 备降点坐标（纬度） */ + /** + * 备降点坐标（纬度） + */ @Excel(name = "备降点纬度") private Double backupLatitude; // ========== 统计信息区域 ========== - /** 运行时长 */ + /** + * 运行时长 + */ @Excel(name = "运行时长") private Integer runningDuration; - /** 作业架次 */ + /** + * 作业架次 + */ @Excel(name = "作业架次") private Integer missionCount; - /** 环境风速 */ + /** + * 环境风速 + */ @Excel(name = "环境风速") private Double windSpeed; - /** 环境雨量 */ + /** + * 环境雨量 + */ @Excel(name = "环境雨量") private Double rainfall; - /** 环境温度 */ + /** + * 环境温度 + */ @Excel(name = "环境温度") private Double environmentTemperature; - /** 环境湿度 */ + /** + * 环境湿度 + */ @Excel(name = "环境湿度") private Double environmentHumidity; // ========== 网络信息区域 ========== - /** 网络类型 */ + /** + * 网络类型 + */ @Excel(name = "网络类型") private String networkType; - /** 网络延迟 */ + /** + * 网络延迟 + */ @Excel(name = "网络延迟") private Integer networkDelay; // ========== 硬件状态区域 ========== - /** 空调状态 */ + /** + * 空调状态 + */ @Excel(name = "空调状态") private String airConditionerStatus; - /** 舱门状态 */ + /** + * 舱门状态 + */ @Excel(name = "舱门状态") private String cabinDoorStatus; - /** 机场状态 */ + /** + * 机场状态 + */ @Excel(name = "机场运行状态") private String dockRunStatus; - /** 舱内摄像头 */ + /** + * 舱内摄像头 + */ @Excel(name = "舱内摄像头") private String internalCamera; - /** 舱外摄像头 */ + /** + * 舱外摄像头 + */ @Excel(name = "舱外摄像头") private String externalCamera; - /** 充放电状态 */ + /** + * 充放电状态 + */ @Excel(name = "充放电状态") private String chargingStatus; - /** 舱内温度 */ + /** + * 舱内温度 + */ @Excel(name = "舱内温度") private Double cabinTemperature; - /** 舱内湿度 */ + /** + * 舱内湿度 + */ @Excel(name = "舱内湿度") private Double cabinHumidity; - /** 升降架位置 */ + /** + * 升降架位置 + */ @Excel(name = "升降架位置") private String elevatorPosition; - /** X轴夹状态 */ + /** + * X轴夹状态 + */ @Excel(name = "X轴夹状态") private String xAxisClampStatus; - /** Y轴夹状态 */ + /** + * Y轴夹状态 + */ @Excel(name = "Y轴夹状态") private String yAxisClampStatus; - // ========== Getter and Setter 方法 ========== - public Long getDockId() - { - return dockId; - } - - public void setDockId(Long dockId) - { - this.dockId = dockId; - } - - public String getDockIotId() - { - return dockIotId; - } - - public void setDockIotId(String dockIotId) - { - this.dockIotId = dockIotId; - } - - public String getManufacturerName() - { - return manufacturerName; - } - - public void setManufacturerName(String manufacturerName) - { - this.manufacturerName = manufacturerName; - } - - public String getDockModel() - { - return dockModel; - } - - public void setDockModel(String dockModel) - { - this.dockModel = dockModel; - } - - public String getFirmwareVersion() - { - return firmwareVersion; - } - - public void setFirmwareVersion(String firmwareVersion) - { - this.firmwareVersion = firmwareVersion; - } - - public String getSnNumber() - { - return snNumber; - } - - public void setSnNumber(String snNumber) - { - this.snNumber = snNumber; - } - - public Long getBindTime() - { - return bindTime; - } - - public void setBindTime(Long bindTime) - { - this.bindTime = bindTime; - } - - public Integer getMaintenanceDays() - { - return maintenanceDays; - } - - public void setMaintenanceDays(Integer maintenanceDays) - { - this.maintenanceDays = maintenanceDays; - } - - public String getDockName() - { - return dockName; - } - - public void setDockName(String dockName) - { - this.dockName = dockName; - } - - public String getDockStatus() - { - return dockStatus; - } - - public void setDockStatus(String dockStatus) - { - this.dockStatus = dockStatus; - } - - public Double getBackupLongitude() - { - return backupLongitude; - } - - public void setBackupLongitude(Double backupLongitude) - { - this.backupLongitude = backupLongitude; - } - - public Double getBackupLatitude() - { - return backupLatitude; - } - - public void setBackupLatitude(Double backupLatitude) - { - this.backupLatitude = backupLatitude; - } - - public Integer getRunningDuration() - { - return runningDuration; - } - - public void setRunningDuration(Integer runningDuration) - { - this.runningDuration = runningDuration; - } - - public Integer getMissionCount() - { - return missionCount; - } - - public void setMissionCount(Integer missionCount) - { - this.missionCount = missionCount; - } - - public Double getWindSpeed() - { - return windSpeed; - } - - public void setWindSpeed(Double windSpeed) - { - this.windSpeed = windSpeed; - } - - public Double getRainfall() - { - return rainfall; - } - - public void setRainfall(Double rainfall) - { - this.rainfall = rainfall; - } - - public Double getEnvironmentTemperature() - { - return environmentTemperature; - } - - public void setEnvironmentTemperature(Double environmentTemperature) - { - this.environmentTemperature = environmentTemperature; - } - - public Double getEnvironmentHumidity() - { - return environmentHumidity; - } - - public void setEnvironmentHumidity(Double environmentHumidity) - { - this.environmentHumidity = environmentHumidity; - } - - public String getNetworkType() - { - return networkType; - } - - public void setNetworkType(String networkType) - { - this.networkType = networkType; - } - - public Integer getNetworkDelay() - { - return networkDelay; - } - - public void setNetworkDelay(Integer networkDelay) - { - this.networkDelay = networkDelay; - } - - public String getAirConditionerStatus() - { - return airConditionerStatus; - } - - public void setAirConditionerStatus(String airConditionerStatus) - { - this.airConditionerStatus = airConditionerStatus; - } - - public String getCabinDoorStatus() - { - return cabinDoorStatus; - } - - public void setCabinDoorStatus(String cabinDoorStatus) - { - this.cabinDoorStatus = cabinDoorStatus; - } - - public String getDockRunStatus() - { - return dockRunStatus; - } - - public void setDockRunStatus(String dockRunStatus) - { - this.dockRunStatus = dockRunStatus; - } - - public String getInternalCamera() - { - return internalCamera; - } - - public void setInternalCamera(String internalCamera) - { - this.internalCamera = internalCamera; - } - - public String getExternalCamera() - { - return externalCamera; - } - - public void setExternalCamera(String externalCamera) - { - this.externalCamera = externalCamera; - } - - public String getChargingStatus() - { - return chargingStatus; - } - - public void setChargingStatus(String chargingStatus) - { - this.chargingStatus = chargingStatus; - } - - public Double getCabinTemperature() - { - return cabinTemperature; - } - - public void setCabinTemperature(Double cabinTemperature) - { - this.cabinTemperature = cabinTemperature; - } - - public Double getCabinHumidity() - { - return cabinHumidity; - } - - public void setCabinHumidity(Double cabinHumidity) - { - this.cabinHumidity = cabinHumidity; - } - - public String getElevatorPosition() - { - return elevatorPosition; - } - - public void setElevatorPosition(String elevatorPosition) - { - this.elevatorPosition = elevatorPosition; - } - - public String getXAxisClampStatus() - { - return xAxisClampStatus; - } - - public void setXAxisClampStatus(String xAxisClampStatus) - { - this.xAxisClampStatus = xAxisClampStatus; - } - - public String getYAxisClampStatus() - { - return yAxisClampStatus; - } - - public void setYAxisClampStatus(String yAxisClampStatus) - { - this.yAxisClampStatus = yAxisClampStatus; - } - - @Override - public String toString() - { - return "DockDetailVO{" + - "dockId=" + dockId + - ", dockIotId='" + dockIotId + '\'' + - ", manufacturerName='" + manufacturerName + '\'' + - ", dockModel='" + dockModel + '\'' + - ", firmwareVersion='" + firmwareVersion + '\'' + - ", snNumber='" + snNumber + '\'' + - ", bindTime=" + bindTime + - ", maintenanceDays=" + maintenanceDays + - ", dockName='" + dockName + '\'' + - ", dockStatus='" + dockStatus + '\'' + - ", backupLongitude=" + backupLongitude + - ", backupLatitude=" + backupLatitude + - ", runningDuration=" + runningDuration + - ", missionCount=" + missionCount + - ", windSpeed=" + windSpeed + - ", rainfall=" + rainfall + - ", environmentTemperature=" + environmentTemperature + - ", environmentHumidity=" + environmentHumidity + - ", networkType='" + networkType + '\'' + - ", networkDelay=" + networkDelay + - ", airConditionerStatus='" + airConditionerStatus + '\'' + - ", cabinDoorStatus='" + cabinDoorStatus + '\'' + - ", dockRunStatus='" + dockRunStatus + '\'' + - ", internalCamera='" + internalCamera + '\'' + - ", externalCamera='" + externalCamera + '\'' + - ", chargingStatus='" + chargingStatus + '\'' + - ", cabinTemperature=" + cabinTemperature + - ", cabinHumidity=" + cabinHumidity + - ", elevatorPosition='" + elevatorPosition + '\'' + - ", xAxisClampStatus='" + xAxisClampStatus + '\'' + - ", yAxisClampStatus='" + yAxisClampStatus + '\'' + - '}'; - } } diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockVO.java index 8e0efba..d55218f 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockVO.java @@ -2,6 +2,8 @@ package com.ruoyi.device.api.domain; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; + import java.util.List; /** @@ -10,6 +12,7 @@ import java.util.List; * @author ruoyi * @date 2026-01-20 */ +@Data public class DockVO extends BaseEntity { private static final long serialVersionUID = 1L; @@ -45,98 +48,4 @@ public class DockVO extends BaseEntity /** 无人机信息 */ private AircraftVO aircraft; - public Long getDockId() - { - return dockId; - } - - public void setDockId(Long dockId) - { - this.dockId = dockId; - } - - public String getDockIotId() - { - return dockIotId; - } - - public void setDockIotId(String dockIotId) - { - this.dockIotId = dockIotId; - } - - public String getDockName() - { - return dockName; - } - - public void setDockName(String dockName) - { - this.dockName = dockName; - } - - public String getDockLocation() - { - return dockLocation; - } - - public void setDockLocation(String dockLocation) - { - this.dockLocation = dockLocation; - } - - public String getDockManufacturer() - { - return dockManufacturer; - } - - public void setDockManufacturer(String dockManufacturer) - { - this.dockManufacturer = dockManufacturer; - } - - public String getDockModel() - { - return dockModel; - } - - public void setDockModel(String dockModel) - { - this.dockModel = dockModel; - } - - public String getDockStatus() - { - return dockStatus; - } - - public void setDockStatus(String dockStatus) - { - this.dockStatus = dockStatus; - } - - public AircraftVO getAircraft() - { - return aircraft; - } - - public void setAircraft(AircraftVO aircraft) - { - this.aircraft = aircraft; - } - - @Override - public String toString() - { - return "DockVO{" + - "dockId=" + dockId + - ", dockIotId='" + dockIotId + '\'' + - ", dockName='" + dockName + '\'' + - ", dockLocation='" + dockLocation + '\'' + - ", dockManufacturer='" + dockManufacturer + '\'' + - ", dockModel='" + dockModel + '\'' + - ", dockStatus='" + dockStatus + '\'' + - ", aircraft=" + aircraft + - '}'; - } } diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupCreateRequest.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupCreateRequest.java index 2ee9048..d8d4204 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupCreateRequest.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupCreateRequest.java @@ -1,30 +1,17 @@ package com.ruoyi.device.api.domain; +import lombok.Data; + /** * 分组创建请求对象 * * @author ruoyi * @date 2026-01-20 */ +@Data public class GroupCreateRequest { private String groupName; - public String getGroupName() - { - return groupName; - } - public void setGroupName(String groupName) - { - this.groupName = groupName; - } - - @Override - public String toString() - { - return "GroupCreateRequest{" + - "groupName='" + groupName + '\'' + - '}'; - } } diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupVO.java index 4225c72..49600ba 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/GroupVO.java @@ -2,6 +2,8 @@ package com.ruoyi.device.api.domain; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; + import java.util.List; /** @@ -10,6 +12,7 @@ import java.util.List; * @author ruoyi * @date 2026-01-20 */ +@Data public class GroupVO extends BaseEntity { private static final long serialVersionUID = 1L; @@ -25,43 +28,5 @@ public class GroupVO extends BaseEntity /** 机场列表 */ private List dockList; - public Long getGroupId() - { - return groupId; - } - public void setGroupId(Long groupId) - { - this.groupId = groupId; - } - - public String getGroupName() - { - return groupName; - } - - public void setGroupName(String groupName) - { - this.groupName = groupName; - } - - public List getDockList() - { - return dockList; - } - - public void setDockList(List dockList) - { - this.dockList = dockList; - } - - @Override - public String toString() - { - return "GroupVO{" + - "groupId=" + groupId + - ", groupName='" + groupName + '\'' + - ", airportList=" + dockList + - '}'; - } } diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/NetworkVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/NetworkVO.java index c49837b..7022e19 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/NetworkVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/NetworkVO.java @@ -2,6 +2,7 @@ package com.ruoyi.device.api.domain; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; /** * 网络信息VO对象 @@ -9,6 +10,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi * @date 2026-01-20 */ +@Data public class NetworkVO extends BaseEntity { private static final long serialVersionUID = 1L; @@ -21,32 +23,4 @@ public class NetworkVO extends BaseEntity @Excel(name = "网络延迟") private Integer networkDelay; - public String getNetworkType() - { - return networkType; - } - - public void setNetworkType(String networkType) - { - this.networkType = networkType; - } - - public Integer getNetworkDelay() - { - return networkDelay; - } - - public void setNetworkDelay(Integer networkDelay) - { - this.networkDelay = networkDelay; - } - - @Override - public String toString() - { - return "NetworkVO{" + - "networkType='" + networkType + '\'' + - ", networkDelay=" + networkDelay + - '}'; - } } diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadDetailVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadDetailVO.java index 58667da..a54cf22 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadDetailVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadDetailVO.java @@ -2,6 +2,7 @@ package com.ruoyi.device.api.domain; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; /** * 挂载详情VO对象 @@ -9,6 +10,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi * @date 2026-01-20 */ +@Data public class PayloadDetailVO extends BaseEntity { private static final long serialVersionUID = 1L; @@ -29,54 +31,5 @@ public class PayloadDetailVO extends BaseEntity @Excel(name = "是否在线") private String onlineStatus; - public String getPayloadType() - { - return payloadType; - } - public void setPayloadType(String payloadType) - { - this.payloadType = payloadType; - } - - public String getPayloadModel() - { - return payloadModel; - } - - public void setPayloadModel(String payloadModel) - { - this.payloadModel = payloadModel; - } - - public String getFirmwareVersion() - { - return firmwareVersion; - } - - public void setFirmwareVersion(String firmwareVersion) - { - this.firmwareVersion = firmwareVersion; - } - - public String getOnlineStatus() - { - return onlineStatus; - } - - public void setOnlineStatus(String onlineStatus) - { - this.onlineStatus = onlineStatus; - } - - @Override - public String toString() - { - return "PayloadDetailVO{" + - "payloadType='" + payloadType + '\'' + - ", payloadModel='" + payloadModel + '\'' + - ", firmwareVersion='" + firmwareVersion + '\'' + - ", onlineStatus='" + onlineStatus + '\'' + - '}'; - } } diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadVO.java index d988dbf..3fedb7c 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/PayloadVO.java @@ -2,6 +2,7 @@ package com.ruoyi.device.api.domain; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; /** * 挂载VO对象 @@ -9,6 +10,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi * @date 2026-01-20 */ +@Data public class PayloadVO extends BaseEntity { private static final long serialVersionUID = 1L; @@ -29,54 +31,5 @@ public class PayloadVO extends BaseEntity @Excel(name = "挂载状态") private String payloadStatus; - public Long getPayloadId() - { - return payloadId; - } - public void setPayloadId(Long payloadId) - { - this.payloadId = payloadId; - } - - public String getPayloadName() - { - return payloadName; - } - - public void setPayloadName(String payloadName) - { - this.payloadName = payloadName; - } - - public String getPayloadType() - { - return payloadType; - } - - public void setPayloadType(String payloadType) - { - this.payloadType = payloadType; - } - - public String getPayloadStatus() - { - return payloadStatus; - } - - public void setPayloadStatus(String payloadStatus) - { - this.payloadStatus = payloadStatus; - } - - @Override - public String toString() - { - return "PayloadVO{" + - "payloadId=" + payloadId + - ", payloadName='" + payloadName + '\'' + - ", payloadType='" + payloadType + '\'' + - ", payloadStatus='" + payloadStatus + '\'' + - '}'; - } } diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java index 539b7ab..97c7213 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java @@ -1,42 +1,18 @@ package com.ruoyi.device.api.domain; +import lombok.Data; + /** * 切换机场分组请求对象 * * @author ruoyi * @date 2026-01-20 */ +@Data public class SwitchDockGroupRequest { private Long dockId; private Long groupId; - public Long getDockId() - { - return dockId; - } - public void setDockId(Long dockId) - { - this.dockId = dockId; - } - - public Long getGroupId() - { - return groupId; - } - - public void setGroupId(Long groupId) - { - this.groupId = groupId; - } - - @Override - public String toString() - { - return "SwitchDockGroupRequest{" + - "dockId=" + dockId + - ", groupId=" + groupId + - '}'; - } } diff --git a/ruoyi-modules/tuoheng-device b/ruoyi-modules/tuoheng-device index 3e5a358..ac9a894 160000 --- a/ruoyi-modules/tuoheng-device +++ b/ruoyi-modules/tuoheng-device @@ -1 +1 @@ -Subproject commit 3e5a358b48b8dc60c337b34c73d6822a6117ce0a +Subproject commit ac9a8944cb3d4ce3b888ca316a8b70e52f491a86