修改代码结构

This commit is contained in:
孙小云 2026-01-21 15:16:32 +08:00
parent eb62f34dc6
commit 3c5ef8e508
14 changed files with 55 additions and 2117 deletions

View File

@ -97,7 +97,7 @@ public class DeviceAttributes {
);
/**
* 固件版本 需要配置
* 固件版本 需要配置 state中; 未收到过
*/
public static final AttributeKey<String> Firmware_Version = AttributeKey.of(
"firmware_version",

View File

@ -1,5 +1,7 @@
package com.ruoyi.device.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@ -10,6 +12,7 @@ import java.util.Date;
* @author ruoyi
* @date 2026-01-16
*/
@Data
public class AircraftDTO implements Serializable
{
private static final long serialVersionUID = 1L;
@ -38,83 +41,7 @@ public class AircraftDTO implements Serializable
/** 备注 */
private String remark;
public Long getAircraftId()
{
return aircraftId;
}
public void setAircraftId(Long aircraftId)
{
this.aircraftId = aircraftId;
}
public String getAircraftName()
{
return aircraftName;
}
public void setAircraftName(String aircraftName)
{
this.aircraftName = aircraftName;
}
public Long getDeviceId()
{
return deviceId;
}
public void setDeviceId(Long deviceId)
{
this.deviceId = deviceId;
}
public String getCreateBy()
{
return createBy;
}
public void setCreateBy(String createBy)
{
this.createBy = createBy;
}
public Date getCreateTime()
{
return createTime;
}
public void setCreateTime(Date createTime)
{
this.createTime = createTime;
}
public String getUpdateBy()
{
return updateBy;
}
public void setUpdateBy(String updateBy)
{
this.updateBy = updateBy;
}
public Date getUpdateTime()
{
return updateTime;
}
public void setUpdateTime(Date updateTime)
{
this.updateTime = updateTime;
}
public String getRemark()
{
return remark;
}
public void setRemark(String remark)
{
this.remark = remark;
}
}

View File

@ -1,5 +1,7 @@
package com.ruoyi.device.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@ -10,6 +12,7 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-20
*/
@Data
public class AircraftDetailDTO implements Serializable
{
private static final long serialVersionUID = 1L;
@ -90,274 +93,4 @@ public class AircraftDetailDTO implements Serializable
/** 循环次数 */
private Integer cycleCount;
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<PayloadDTO> getPayloadList()
{
return payloadList;
}
public void setPayloadList(List<PayloadDTO> payloadList)
{
this.payloadList = payloadList;
}
public String getManufacturerName()
{
return manufacturerName;
}
public void setManufacturerName(String manufacturerName)
{
this.manufacturerName = manufacturerName;
}
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 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<NetworkDTO> getNetworkList()
{
return networkList;
}
public void setNetworkList(List<NetworkDTO> 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 "AircraftDetailDTO{" +
"aircraftId=" + aircraftId +
", aircraftIotId='" + aircraftIotId + '\'' +
", aircraftName='" + aircraftName + '\'' +
", aircraftManufacturer='" + aircraftManufacturer + '\'' +
", aircraftModel='" + aircraftModel + '\'' +
", aircraftStatus='" + aircraftStatus + '\'' +
", payloadList=" + payloadList +
", manufacturerName='" + manufacturerName + '\'' +
", aircraftVersion='" + aircraftVersion + '\'' +
", snNumber='" + snNumber + '\'' +
", batterySn='" + batterySn + '\'' +
", bindTime=" + bindTime +
", maintenanceDays=" + maintenanceDays +
", flightDuration=" + flightDuration +
", missionCount=" + missionCount +
", networkList=" + networkList +
", rtkSignal=" + rtkSignal +
", maxAltitude=" + maxAltitude +
", maxDistance=" + maxDistance +
", voltage=" + voltage +
", batteryLevel=" + batteryLevel +
", flightTimeRemaining=" + flightTimeRemaining +
", batteryTemperature=" + batteryTemperature +
", cycleCount=" + cycleCount +
'}';
}
}

View File

@ -1,5 +1,7 @@
package com.ruoyi.device.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@ -10,6 +12,7 @@ import java.util.Date;
* @author ruoyi
* @date 2026-01-16
*/
@Data
public class AircraftPayloadDTO implements Serializable
{
private static final long serialVersionUID = 1L;
@ -41,93 +44,5 @@ public class AircraftPayloadDTO implements Serializable
/** 备注 */
private String remark;
public Long getId()
{
return id;
}
public void setId(Long id)
{
this.id = id;
}
public Long getAircraftId()
{
return aircraftId;
}
public void setAircraftId(Long aircraftId)
{
this.aircraftId = aircraftId;
}
public Long getPayloadId()
{
return payloadId;
}
public void setPayloadId(Long payloadId)
{
this.payloadId = payloadId;
}
public Long getDockId()
{
return dockId;
}
public void setDockId(Long dockId)
{
this.dockId = dockId;
}
public String getCreateBy()
{
return createBy;
}
public void setCreateBy(String createBy)
{
this.createBy = createBy;
}
public Date getCreateTime()
{
return createTime;
}
public void setCreateTime(Date createTime)
{
this.createTime = createTime;
}
public String getUpdateBy()
{
return updateBy;
}
public void setUpdateBy(String updateBy)
{
this.updateBy = updateBy;
}
public Date getUpdateTime()
{
return updateTime;
}
public void setUpdateTime(Date updateTime)
{
this.updateTime = updateTime;
}
public String getRemark()
{
return remark;
}
public void setRemark(String remark)
{
this.remark = remark;
}
}

View File

@ -1,5 +1,7 @@
package com.ruoyi.device.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@ -10,6 +12,7 @@ import java.util.Date;
* @author ruoyi
* @date 2026-01-16
*/
@Data
public class DeviceDTO implements Serializable
{
private static final long serialVersionUID = 1L;
@ -56,143 +59,5 @@ public class DeviceDTO implements Serializable
/** 备注 */
private String remark;
public Long getDeviceId()
{
return deviceId;
}
public void setDeviceId(Long deviceId)
{
this.deviceId = deviceId;
}
public String getDeviceName()
{
return deviceName;
}
public void setDeviceName(String deviceName)
{
this.deviceName = deviceName;
}
public String getIotDeviceId()
{
return iotDeviceId;
}
public void setIotDeviceId(String iotDeviceId)
{
this.iotDeviceId = iotDeviceId;
}
public String getDeviceType()
{
return deviceType;
}
public void setDeviceType(String deviceType)
{
this.deviceType = deviceType;
}
public String getDeviceManufacturer()
{
return deviceManufacturer;
}
public void setDeviceManufacturer(String deviceManufacturer)
{
this.deviceManufacturer = deviceManufacturer;
}
public String getDeviceModel()
{
return deviceModel;
}
public void setDeviceModel(String deviceModel)
{
this.deviceModel = deviceModel;
}
public String getDeviceSn()
{
return deviceSn;
}
public void setDeviceSn(String deviceSn)
{
this.deviceSn = deviceSn;
}
public Long getDeptId()
{
return deptId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public String getGateway()
{
return gateway;
}
public void setGateway(String gateway)
{
this.gateway = gateway;
}
public String getCreateBy()
{
return createBy;
}
public void setCreateBy(String createBy)
{
this.createBy = createBy;
}
public Date getCreateTime()
{
return createTime;
}
public void setCreateTime(Date createTime)
{
this.createTime = createTime;
}
public String getUpdateBy()
{
return updateBy;
}
public void setUpdateBy(String updateBy)
{
this.updateBy = updateBy;
}
public Date getUpdateTime()
{
return updateTime;
}
public void setUpdateTime(Date updateTime)
{
this.updateTime = updateTime;
}
public String getRemark()
{
return remark;
}
public void setRemark(String remark)
{
this.remark = remark;
}
}

View File

@ -1,5 +1,7 @@
package com.ruoyi.device.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@ -10,6 +12,7 @@ import java.util.Date;
* @author ruoyi
* @date 2026-01-15
*/
@Data
public class DeviceTempDTO implements Serializable
{
private static final long serialVersionUID = 1L;
@ -23,33 +26,5 @@ public class DeviceTempDTO implements Serializable
/** 更新时间 */
private Date updateTime;
public String getId()
{
return id;
}
public void setId(String id)
{
this.id = id;
}
public Date getCreateTime()
{
return createTime;
}
public void setCreateTime(Date createTime)
{
this.createTime = createTime;
}
public Date getUpdateTime()
{
return updateTime;
}
public void setUpdateTime(Date updateTime)
{
this.updateTime = updateTime;
}
}

View File

@ -1,5 +1,7 @@
package com.ruoyi.device.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@ -10,6 +12,7 @@ import java.util.Date;
* @author ruoyi
* @date 2026-01-16
*/
@Data
public class DockAircraftDTO implements Serializable
{
private static final long serialVersionUID = 1L;
@ -38,83 +41,4 @@ public class DockAircraftDTO implements Serializable
/** 备注 */
private String remark;
public Long getId()
{
return id;
}
public void setId(Long id)
{
this.id = id;
}
public Long getDockId()
{
return dockId;
}
public void setDockId(Long dockId)
{
this.dockId = dockId;
}
public Long getAircraftId()
{
return aircraftId;
}
public void setAircraftId(Long aircraftId)
{
this.aircraftId = aircraftId;
}
public String getCreateBy()
{
return createBy;
}
public void setCreateBy(String createBy)
{
this.createBy = createBy;
}
public Date getCreateTime()
{
return createTime;
}
public void setCreateTime(Date createTime)
{
this.createTime = createTime;
}
public String getUpdateBy()
{
return updateBy;
}
public void setUpdateBy(String updateBy)
{
this.updateBy = updateBy;
}
public Date getUpdateTime()
{
return updateTime;
}
public void setUpdateTime(Date updateTime)
{
this.updateTime = updateTime;
}
public String getRemark()
{
return remark;
}
public void setRemark(String remark)
{
this.remark = remark;
}
}

View File

@ -1,5 +1,7 @@
package com.ruoyi.device.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@ -10,6 +12,7 @@ import java.util.Date;
* @author ruoyi
* @date 2026-01-16
*/
@Data
public class DockDTO implements Serializable
{
private static final long serialVersionUID = 1L;
@ -41,93 +44,5 @@ public class DockDTO implements Serializable
/** 备注 */
private String remark;
public Long getDockId()
{
return dockId;
}
public void setDockId(Long dockId)
{
this.dockId = dockId;
}
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 Long getDeviceId()
{
return deviceId;
}
public void setDeviceId(Long deviceId)
{
this.deviceId = deviceId;
}
public String getCreateBy()
{
return createBy;
}
public void setCreateBy(String createBy)
{
this.createBy = createBy;
}
public Date getCreateTime()
{
return createTime;
}
public void setCreateTime(Date createTime)
{
this.createTime = createTime;
}
public String getUpdateBy()
{
return updateBy;
}
public void setUpdateBy(String updateBy)
{
this.updateBy = updateBy;
}
public Date getUpdateTime()
{
return updateTime;
}
public void setUpdateTime(Date updateTime)
{
this.updateTime = updateTime;
}
public String getRemark()
{
return remark;
}
public void setRemark(String remark)
{
this.remark = remark;
}
}

View File

@ -1,5 +1,7 @@
package com.ruoyi.device.service.dto;
import lombok.Data;
import java.io.Serializable;
/**
@ -9,6 +11,7 @@ import java.io.Serializable;
* @author ruoyi
* @date 2026-01-20
*/
@Data
public class DockDetailDTO implements Serializable
{
private static final long serialVersionUID = 1L;
@ -119,384 +122,5 @@ public class DockDetailDTO implements Serializable
/** Y轴夹状态 */
private String yAxisClampStatus;
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 AircraftDTO getAircraft()
{
return aircraft;
}
public void setAircraft(AircraftDTO aircraft)
{
this.aircraft = aircraft;
}
public String getManufacturerName()
{
return manufacturerName;
}
public void setManufacturerName(String manufacturerName)
{
this.manufacturerName = manufacturerName;
}
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 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 "DockDetailDTO{" +
"dockId=" + dockId +
", dockIotId='" + dockIotId + '\'' +
", dockName='" + dockName + '\'' +
", dockLocation='" + dockLocation + '\'' +
", dockManufacturer='" + dockManufacturer + '\'' +
", dockModel='" + dockModel + '\'' +
", dockStatus='" + dockStatus + '\'' +
", aircraft=" + aircraft +
", manufacturerName='" + manufacturerName + '\'' +
", firmwareVersion='" + firmwareVersion + '\'' +
", snNumber='" + snNumber + '\'' +
", bindTime=" + bindTime +
", maintenanceDays=" + maintenanceDays +
", 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 + '\'' +
'}';
}
}

View File

@ -1,5 +1,7 @@
package com.ruoyi.device.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@ -10,6 +12,7 @@ import java.util.Date;
* @author ruoyi
* @date 2026-01-16
*/
@Data
public class DockGroupDTO implements Serializable
{
private static final long serialVersionUID = 1L;
@ -38,83 +41,5 @@ public class DockGroupDTO implements Serializable
/** 备注 */
private String remark;
public Long getId()
{
return id;
}
public void setId(Long id)
{
this.id = id;
}
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;
}
public String getCreateBy()
{
return createBy;
}
public void setCreateBy(String createBy)
{
this.createBy = createBy;
}
public Date getCreateTime()
{
return createTime;
}
public void setCreateTime(Date createTime)
{
this.createTime = createTime;
}
public String getUpdateBy()
{
return updateBy;
}
public void setUpdateBy(String updateBy)
{
this.updateBy = updateBy;
}
public Date getUpdateTime()
{
return updateTime;
}
public void setUpdateTime(Date updateTime)
{
this.updateTime = updateTime;
}
public String getRemark()
{
return remark;
}
public void setRemark(String remark)
{
this.remark = remark;
}
}

View File

@ -1,5 +1,7 @@
package com.ruoyi.device.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@ -10,6 +12,7 @@ import java.util.Date;
* @author ruoyi
* @date 2026-01-16
*/
@Data
public class GroupDTO implements Serializable
{
private static final long serialVersionUID = 1L;
@ -35,73 +38,5 @@ public class GroupDTO implements Serializable
/** 备注 */
private String remark;
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 String getCreateBy()
{
return createBy;
}
public void setCreateBy(String createBy)
{
this.createBy = createBy;
}
public Date getCreateTime()
{
return createTime;
}
public void setCreateTime(Date createTime)
{
this.createTime = createTime;
}
public String getUpdateBy()
{
return updateBy;
}
public void setUpdateBy(String updateBy)
{
this.updateBy = updateBy;
}
public Date getUpdateTime()
{
return updateTime;
}
public void setUpdateTime(Date updateTime)
{
this.updateTime = updateTime;
}
public String getRemark()
{
return remark;
}
public void setRemark(String remark)
{
this.remark = remark;
}
}

View File

@ -1,5 +1,7 @@
package com.ruoyi.device.service.dto;
import lombok.Data;
import java.io.Serializable;
/**
@ -8,6 +10,7 @@ import java.io.Serializable;
* @author ruoyi
* @date 2026-01-20
*/
@Data
public class NetworkDTO implements Serializable
{
private static final long serialVersionUID = 1L;
@ -18,32 +21,5 @@ public class NetworkDTO implements Serializable
/** 网络延迟 */
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 "NetworkDTO{" +
"networkType='" + networkType + '\'' +
", networkDelay=" + networkDelay +
'}';
}
}

View File

@ -1,5 +1,7 @@
package com.ruoyi.device.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@ -10,6 +12,7 @@ import java.util.Date;
* @author ruoyi
* @date 2026-01-16
*/
@Data
public class PayloadDTO implements Serializable
{
private static final long serialVersionUID = 1L;
@ -50,123 +53,5 @@ public class PayloadDTO implements Serializable
/** 备注 */
private String remark;
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 getPayloadDisplayName()
{
return payloadDisplayName;
}
public void setPayloadDisplayName(String payloadDisplayName)
{
this.payloadDisplayName = payloadDisplayName;
}
public String getPayloadDynamicInfo()
{
return payloadDynamicInfo;
}
public void setPayloadDynamicInfo(String payloadDynamicInfo)
{
this.payloadDynamicInfo = payloadDynamicInfo;
}
public String getPayloadSn()
{
return payloadSn;
}
public void setPayloadSn(String payloadSn)
{
this.payloadSn = payloadSn;
}
public String getIotDeviceId()
{
return iotDeviceId;
}
public void setIotDeviceId(String iotDeviceId)
{
this.iotDeviceId = iotDeviceId;
}
public String getCreateBy()
{
return createBy;
}
public void setCreateBy(String createBy)
{
this.createBy = createBy;
}
public Date getCreateTime()
{
return createTime;
}
public void setCreateTime(Date createTime)
{
this.createTime = createTime;
}
public String getUpdateBy()
{
return updateBy;
}
public void setUpdateBy(String updateBy)
{
this.updateBy = updateBy;
}
public Date getUpdateTime()
{
return updateTime;
}
public void setUpdateTime(Date updateTime)
{
this.updateTime = updateTime;
}
public String getRemark()
{
return remark;
}
public void setRemark(String remark)
{
this.remark = remark;
}
}

View File

@ -19,9 +19,10 @@ import com.ruoyi.device.service.api.IBufferDeviceService;
import com.ruoyi.device.service.dto.AircraftDTO;
import com.ruoyi.device.service.dto.AircraftDetailDTO;
import com.ruoyi.device.service.dto.DockDetailDTO;
import com.ruoyi.device.service.dto.NetworkDTO;
import com.ruoyi.device.service.dto.PayloadDTO;
import com.ruoyi.device.service.dto.ThingsBoardData;
import com.ruoyi.device.service.convert.AircraftDTOConvert;
import com.ruoyi.device.service.enums.DockStatusEnum;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -56,711 +57,49 @@ public class BufferDeviceImpl implements IBufferDeviceService
public DockDetailDTO getDockDetailById(Long dockId)
{
DockDetailDTO dto = new DockDetailDTO();
Dock dock = dockDomain.selectDockByDockId(dockId);
log.info("selectDockByDockId {}",JSON.toJSONString(dock));
if (dock == null)
{
return null;
}
Device device = deviceDomain.selectDeviceByDeviceId(dock.getDeviceId());
log.info("selectDeviceByDeviceId {}",JSON.toJSONString(device));
DockDetailDTO dto = getChangeAbleDockDetailDTO(device.getIotDeviceId());
dto.setDockId(dock.getDockId());
dto.setDockName(dock.getDockName());
dto.setDockLocation(dock.getDockLocation());
Device device = deviceDomain.selectDeviceByDeviceId(dock.getDeviceId());
log.info("selectDeviceByDeviceId {}",JSON.toJSONString(device));
dto.setDockIotId(device.getIotDeviceId());
ThingsBoardData thingsBoardData = getThingsBoardData("dock", device.getIotDeviceId());
dto.setFirmwareVersion(thingsBoardData.getFirmwareVersion());
dto.setSnNumber(thingsBoardData.getSnNumber());
dto.setBindTime(thingsBoardData.getBindTime());
dto.setMaintenanceDays(thingsBoardData.getMaintenanceDays());
dto.setDockStatus(thingsBoardData.getDockStatus());
dto.setBackupLongitude(thingsBoardData.getBackupLongitude());
dto.setBackupLatitude(thingsBoardData.getBackupLatitude());
dto.setRunningDuration(thingsBoardData.getRunningDuration());
dto.setMissionCount(thingsBoardData.getMissionCount());
dto.setWindSpeed(thingsBoardData.getWindSpeed());
dto.setRainfall(thingsBoardData.getRainfall());
dto.setEnvironmentTemperature(thingsBoardData.getEnvironmentTemperature());
dto.setEnvironmentHumidity(thingsBoardData.getEnvironmentHumidity());
dto.setNetworkType(thingsBoardData.getNetworkType());
dto.setNetworkDelay(thingsBoardData.getNetworkDelay());
dto.setAirConditionerStatus(thingsBoardData.getAirConditionerStatus());
dto.setCabinDoorStatus(thingsBoardData.getCabinDoorStatus());
dto.setDockRunStatus(thingsBoardData.getDockRunStatus());
dto.setInternalCamera(thingsBoardData.getInternalCamera());
dto.setExternalCamera(thingsBoardData.getExternalCamera());
dto.setChargingStatus(thingsBoardData.getChargingStatus());
dto.setCabinTemperature(thingsBoardData.getCabinTemperature());
dto.setCabinHumidity(thingsBoardData.getCabinHumidity());
dto.setElevatorPosition(thingsBoardData.getElevatorPosition());
dto.setXAxisClampStatus(thingsBoardData.getXAxisClampStatus());
dto.setYAxisClampStatus(thingsBoardData.getYAxisClampStatus());
return dto;
return null;
}
@Override
public AircraftDetailDTO getAircraftDetailById(Long aircraftId)
{
Aircraft aircraft = aircraftDomain.selectAircraftByAircraftId(aircraftId);
if (aircraft == null)
{
return null;
}
AircraftDTO aircraftDTO = AircraftDTOConvert.from(aircraft);
AircraftDetailDTO result = new AircraftDetailDTO();
result.setAircraftId(aircraftDTO.getAircraftId());
result.setAircraftName(aircraftDTO.getAircraftName());
ThingsBoardData thingsBoardData = getThingsBoardData("aircraft", null);
if (thingsBoardData != null)
{
result.setManufacturerName(thingsBoardData.getManufacturerName());
result.setAircraftVersion(thingsBoardData.getAircraftVersion());
result.setSnNumber(thingsBoardData.getSnNumber());
result.setBatterySn(thingsBoardData.getBatterySn());
result.setBindTime(thingsBoardData.getBindTime());
result.setMaintenanceDays(thingsBoardData.getMaintenanceDays());
result.setFlightDuration(thingsBoardData.getFlightDuration());
result.setMissionCount(thingsBoardData.getMissionCount());
result.setNetworkList(thingsBoardData.getNetworkList());
result.setRtkSignal(thingsBoardData.getRtkSignal());
result.setMaxAltitude(thingsBoardData.getMaxAltitude());
result.setMaxDistance(thingsBoardData.getMaxDistance());
result.setVoltage(thingsBoardData.getVoltage());
result.setBatteryLevel(thingsBoardData.getBatteryLevel());
result.setFlightTimeRemaining(thingsBoardData.getFlightTimeRemaining());
result.setBatteryTemperature(thingsBoardData.getBatteryTemperature());
result.setCycleCount(thingsBoardData.getCycleCount());
result.setPayloadList(thingsBoardData.getPayloadList());
}
return result;
}
private ThingsBoardData getThingsBoardData(String deviceType, String deviceIotId)
{
ThingsBoardData data = new ThingsBoardData();
AttributeMap attributes = thingsBoardDomain.getPredefinedDeviceAttributes(deviceIotId);
if (attributes != null)
{
data.setFirmwareVersion(attributes.get(DeviceAttributes.Firmware_Version).orElse(null));
data.setSnNumber(attributes.get(DeviceAttributes.DOCK_SN).orElse(null));
data.setSubDeviceSn(attributes.get(DeviceAttributes.SUB_DEVICE_SN).orElse(null));
Integer modeCode = attributes.get(DeviceAttributes.MODE_CODE).orElse(null);
if (modeCode != null)
{
if ("dock".equals(deviceType))
{
data.setDockStatus(getDockStatus(modeCode));
}
else if ("aircraft".equals(deviceType))
{
data.setAircraftStatus(getAircraftStatus(modeCode));
}
}
}
TelemetryMap telemetry = thingsBoardDomain.getPredefinedDeviceTelemetry(deviceIotId);
if (telemetry != null)
{
data.setRunningDuration(telemetry.get(DeviceTelemetry.Acc_Time).map(TelemetryValue::getValue).orElse(null));
data.setMissionCount(telemetry.get(DeviceTelemetry.Total_Flight_Sorties).map(TelemetryValue::getValue).orElse(null));
data.setWindSpeed(telemetry.get(DeviceTelemetry.Wind_Speed).map(TelemetryValue::getValue).orElse(null));
// data.setRainfall(telemetry.get(DeviceTelemetry.Rainfall).map(TelemetryValue::getValue).orElse(null));
data.setEnvironmentTemperature(telemetry.get(DeviceTelemetry.TEMPERATURE).map(TelemetryValue::getValue).orElse(null));
data.setEnvironmentHumidity(telemetry.get(DeviceTelemetry.HUMIDITY).map(TelemetryValue::getValue).orElse(null));
Integer networkType = telemetry.get(DeviceTelemetry.Network_State_Type).map(TelemetryValue::getValue).orElse(null);
if (networkType != null)
{
data.setNetworkType(getNetworkType(networkType));
}
data.setCabinTemperature(telemetry.get(DeviceTelemetry.TEMPERATURE).map(TelemetryValue::getValue).orElse(null));
data.setCabinHumidity(telemetry.get(DeviceTelemetry.HUMIDITY).map(TelemetryValue::getValue).orElse(null));
data.setFlightDuration(telemetry.get(DeviceTelemetry.Acc_Time).map(TelemetryValue::getValue).orElse(null));
data.setRtkSignal(getRtkSignal(telemetry.get(DeviceTelemetry.Position_State_Rtk_Number).map(TelemetryValue::getValue).orElse(null)));
data.setMaxAltitude(telemetry.get(DeviceTelemetry.Height_Limit).map(TelemetryValue::getValue).orElse(null));
data.setMaxDistance(telemetry.get(DeviceTelemetry.Distance_Limit_Status_Distance_Limit).map(TelemetryValue::getValue).orElse(null));
BatteryData battery = telemetry.get(DeviceTelemetry.BATTERY).map(TelemetryValue::getValue).orElse(null);
if (battery != null)
{
data.setBatteryLevel(battery.getCapacityPercent());
data.setFlightTimeRemaining(battery.getRemainFlightTime() != null ? battery.getRemainFlightTime().doubleValue() : null);
}
List<PsdkDevice> psdkDevices = telemetry.get(DeviceTelemetry.PSDK_WIDGET_VALUES).map(TelemetryValue::getValue).orElse(null);
if (psdkDevices != null)
{
List<PayloadDTO> payloadList = psdkDevices.stream()
.map(this::convertToPayloadDTO)
.collect(Collectors.toList());
data.setPayloadList(payloadList);
}
}
log.info("getThingsBoardData {}", JSON.toJSONString(data));
return data;
}
private String getDockStatus(Integer modeCode)
{
if (modeCode == null)
{
return null;
}
String[] statusMap = {"空闲中", "现场调试", "远程调试", "固件升级中", "作业中", "待标定"};
if (modeCode >= 0 && modeCode < statusMap.length)
{
return statusMap[modeCode];
}
return null;
}
private String getAircraftStatus(Integer modeCode)
private DockDetailDTO getChangeAbleDockDetailDTO(String deviceIotId)
{
if (modeCode == null)
{
return null;
}
String[] statusMap = {"待机", "起飞准备", "起飞准备完毕", "手动飞行", "自动起飞", "航线飞行",
"全景拍照", "智能跟随", "ADS-B 躲避", "自动返航", "自动降落", "强制降落",
"三桨叶降落", "升级中", "未连接", "APAS", "虚拟摇杆状态", "指令飞行",
"空中 RTK 收敛模式", "机场选址中", "POI环绕"};
if (modeCode >= 0 && modeCode < statusMap.length)
{
return statusMap[modeCode];
}
return null;
}
private String getNetworkType(Integer networkType)
private AircraftDetailDTO getChangeAbleAirDetailDTO(String deviceIotId)
{
if (networkType == null)
{
return null;
}
if (networkType == 1)
{
return "4G";
}
else if (networkType == 2)
{
return "以太网";
}
return null;
}
private Double getRtkSignal(Integer rtkNumber)
{
if (rtkNumber == null)
{
return null;
}
return rtkNumber.doubleValue();
}
private PayloadDTO convertToPayloadDTO(PsdkDevice psdkDevice)
{
PayloadDTO dto = new PayloadDTO();
dto.setPayloadName(psdkDevice.getPsdk_name());
dto.setPayloadType(psdkDevice.getPsdk_lib_version());
// dto.setPayloadStatus(psdkDevice.getPsdk_version());
return dto;
}
private static class ThingsBoardData
{
private String firmwareVersion;
private String snNumber;
private String subDeviceSn;
private String dockName;
private String dockStatus;
private String aircraftStatus;
private Long bindTime;
private Integer maintenanceDays;
private Double backupLongitude;
private Double backupLatitude;
private Integer runningDuration;
private Integer missionCount;
private Double windSpeed;
private Double rainfall;
private Double environmentTemperature;
private Double environmentHumidity;
private String networkType;
private Integer networkDelay;
private String airConditionerStatus;
private String cabinDoorStatus;
private String dockRunStatus;
private String internalCamera;
private String externalCamera;
private String chargingStatus;
private Double cabinTemperature;
private Double cabinHumidity;
private String elevatorPosition;
private String xAxisClampStatus;
private String yAxisClampStatus;
private String manufacturerName;
private String aircraftVersion;
private String batterySn;
private Integer flightDuration;
private List<NetworkDTO> networkList;
private Double rtkSignal;
private Integer maxAltitude;
private Integer maxDistance;
private Double voltage;
private Integer batteryLevel;
private Double flightTimeRemaining;
private Double batteryTemperature;
private Integer cycleCount;
private List<PayloadDTO> payloadList;
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 String getSubDeviceSn()
{
return subDeviceSn;
}
public void setSubDeviceSn(String subDeviceSn)
{
this.subDeviceSn = subDeviceSn;
}
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 String getAircraftStatus()
{
return aircraftStatus;
}
public void setAircraftStatus(String aircraftStatus)
{
this.aircraftStatus = aircraftStatus;
}
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 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;
}
public String getManufacturerName()
{
return manufacturerName;
}
public void setManufacturerName(String manufacturerName)
{
this.manufacturerName = manufacturerName;
}
public String getAircraftVersion()
{
return aircraftVersion;
}
public void setAircraftVersion(String aircraftVersion)
{
this.aircraftVersion = aircraftVersion;
}
public String getBatterySn()
{
return batterySn;
}
public void setBatterySn(String batterySn)
{
this.batterySn = batterySn;
}
public Integer getFlightDuration()
{
return flightDuration;
}
public void setFlightDuration(Integer flightDuration)
{
this.flightDuration = flightDuration;
}
public List<NetworkDTO> getNetworkList()
{
return networkList;
}
public void setNetworkList(List<NetworkDTO> 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;
}
public List<PayloadDTO> getPayloadList()
{
return payloadList;
}
public void setPayloadList(List<PayloadDTO> payloadList)
{
this.payloadList = payloadList;
}
}
}