From 35c0cf0c63062473179a4c76d0cb4158adb60d4f 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 16:55:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E4=BA=BA=E6=9C=BA?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/DockController.java | 6 +- .../convert/DockDetailVOConvert.java | 88 ------------------- .../device/service/dto/AircraftDetailDTO.java | 7 +- .../device/service/dto/DockDetailDTO.java | 5 +- 4 files changed, 7 insertions(+), 99 deletions(-) delete mode 100644 src/main/java/com/ruoyi/device/controller/convert/DockDetailVOConvert.java diff --git a/src/main/java/com/ruoyi/device/controller/DockController.java b/src/main/java/com/ruoyi/device/controller/DockController.java index 2726bce..ec390d0 100644 --- a/src/main/java/com/ruoyi/device/controller/DockController.java +++ b/src/main/java/com/ruoyi/device/controller/DockController.java @@ -7,7 +7,6 @@ import com.ruoyi.device.api.domain.DockDetailVO; import com.ruoyi.device.api.domain.DockVO; import com.ruoyi.device.service.api.IDockService; import com.ruoyi.device.service.api.IBufferDeviceService; -import com.ruoyi.device.controller.convert.DockDetailVOConvert; import com.ruoyi.device.service.dto.DockDetailDTO; import com.ruoyi.device.service.dto.DockDTO; import com.ruoyi.device.controller.convert.DockVOConvert; @@ -58,8 +57,7 @@ public class DockController extends BaseController @GetMapping("/detail/{dockId}") public R getDockDetail(@PathVariable("dockId") Long dockId) { - DockDetailDTO dto = bufferDeviceService.getDockDetailById(dockId); - DockDetailVO vo = DockDetailVOConvert.from(dto); - return R.ok(vo); + + return R.ok(null); } } diff --git a/src/main/java/com/ruoyi/device/controller/convert/DockDetailVOConvert.java b/src/main/java/com/ruoyi/device/controller/convert/DockDetailVOConvert.java deleted file mode 100644 index 34a6c77..0000000 --- a/src/main/java/com/ruoyi/device/controller/convert/DockDetailVOConvert.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.ruoyi.device.controller.convert; - -import com.ruoyi.common.core.utils.BaseConvert; -import com.ruoyi.device.api.domain.DockDetailVO; -import com.ruoyi.device.service.dto.DockDetailDTO; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * 设备缓冲服务转换类 - * 用于 DTO 到 VO 的转换 - * - * @author ruoyi - * @date 2026-01-20 - */ -public class DockDetailVOConvert extends BaseConvert -{ - - private static final DockDetailVOConvert INSTANCE = new DockDetailVOConvert(); - - private DockDetailVOConvert() { - super(DockDetailDTO.class, DockDetailVO.class); - } - - public static DockDetailVO from(DockDetailDTO dto) - { - if (dto == null) - { - return null; - } - - DockDetailVO vo = new DockDetailVO(); - - vo.setDockId(dto.getDockId()); - vo.setDockName(dto.getDockName()); - vo.setManufacturerName(dto.getManufacturerName()); - vo.setFirmwareVersion(dto.getFirmwareVersion()); - vo.setSnNumber(dto.getSnNumber()); - vo.setBindTime(dto.getBindTime()); - vo.setMaintenanceDays(dto.getMaintenanceDays()); - vo.setDockName(dto.getDockName()); - vo.setDockStatus(dto.getDockStatus()); - vo.setBackupLongitude(dto.getBackupLongitude()); - vo.setBackupLatitude(dto.getBackupLatitude()); - vo.setRunningDuration(dto.getRunningDuration()); - vo.setMissionCount(dto.getMissionCount()); - vo.setWindSpeed(dto.getWindSpeed()); - vo.setRainfall(dto.getRainfall()); - vo.setEnvironmentTemperature(dto.getEnvironmentTemperature()); - vo.setEnvironmentHumidity(dto.getEnvironmentHumidity()); - vo.setNetworkType(dto.getNetworkType()); - vo.setNetworkDelay(dto.getNetworkDelay()); - vo.setAirConditionerStatus(dto.getAirConditionerStatus()); - vo.setCabinDoorStatus(dto.getCabinDoorStatus()); - vo.setDockRunStatus(dto.getDockRunStatus()); - vo.setInternalCamera(dto.getInternalCamera()); - vo.setExternalCamera(dto.getExternalCamera()); - vo.setChargingStatus(dto.getChargingStatus()); - vo.setCabinTemperature(dto.getCabinTemperature()); - vo.setCabinHumidity(dto.getCabinHumidity()); - vo.setElevatorPosition(dto.getElevatorPosition()); - vo.setXAxisClampStatus(dto.getXAxisClampStatus()); - vo.setYAxisClampStatus(dto.getYAxisClampStatus()); - - return vo; - } - - public static DockDetailDTO to(DockDetailVO vo) - { - return INSTANCE.innerTo(vo); - } - - public static List fromList(List dtoList) - { - if (dtoList == null) - { - return null; - } - return dtoList.stream().map(DockDetailVOConvert::from).collect(Collectors.toList()); - } - - public static List toList(List voList) - { - return INSTANCE.innerToList(voList); - } - -} \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/service/dto/AircraftDetailDTO.java b/src/main/java/com/ruoyi/device/service/dto/AircraftDetailDTO.java index 7444ad7..83a39c6 100644 --- a/src/main/java/com/ruoyi/device/service/dto/AircraftDetailDTO.java +++ b/src/main/java/com/ruoyi/device/service/dto/AircraftDetailDTO.java @@ -7,7 +7,7 @@ import java.util.List; /** * 无人机详情DTO对象 - * 包含 AircraftVO 和 AircraftDetailVO 的所有字段 + * 字段与 AircraftDetailVO 保持一致（包含 AircraftVO 的所有字段） * * @author ruoyi * @date 2026-01-20 @@ -40,10 +40,9 @@ public class AircraftDetailDTO implements Serializable /** 挂载列表 */ private List payloadList; - // ========== AircraftDetailVO 字段 ========== + // ========== AircraftDetailVO 特有字段 ========== + - /** 厂商名称 */ - private String manufacturerName; /** 无人机版本 */ private String aircraftVersion; diff --git a/src/main/java/com/ruoyi/device/service/dto/DockDetailDTO.java b/src/main/java/com/ruoyi/device/service/dto/DockDetailDTO.java index 24181ac..7ba70da 100644 --- a/src/main/java/com/ruoyi/device/service/dto/DockDetailDTO.java +++ b/src/main/java/com/ruoyi/device/service/dto/DockDetailDTO.java @@ -9,7 +9,7 @@ import java.util.List; /** * 机场详情DTO对象 - * 包含 DockVO 和 DockDetailVO 的所有字段 + * 字段与 DockDetailVO 保持一致（包含 DockVO 的所有字段） * * @author ruoyi * @date 2026-01-20 @@ -63,8 +63,7 @@ public class DockDetailDTO implements Serializable /** 挂载列表 */ private List payloadList; - // ========== DetailVO 字段 ========== - + // ========== DockDetailVO 特有字段 ========== /** 固件版本 */ private String firmwareVersion;