From f4f5db269a0e276a63af0ce52c30677b6cf1a5b9 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 13:18:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9convert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/AircraftController.java | 5 +- .../controller/DeviceTempController.java | 10 +-- .../device/controller/DockController.java | 8 +- .../device/controller/GroupController.java | 5 +- .../convert/AircraftDetailDTOConvert.java | 69 ---------------- .../convert/AircraftDetailVOConvert.java | 39 +++++++++ ...rConvert.java => DeviceTempVOConvert.java} | 6 +- .../convert/DockControllerConvert.java | 55 ------------- ...OConvert.java => DockDetailVOConvert.java} | 8 +- .../convert/DockVOControllerConvert.java | 49 ------------ .../controller/convert/DockVOConvert.java | 80 +++++++++++++++++++ ...rollerConvert.java => GroupVOConvert.java} | 6 +- ...llerConvert.java => NetworkVOConvert.java} | 23 ++---- ...nvert.java => PayloadDetailVOConvert.java} | 6 +- ...ntityConvert.java => AircraftConvert.java} | 12 +-- ...nvert.java => AircraftPayloadConvert.java} | 10 +-- ...nEntityConvert.java => DeviceConvert.java} | 6 +- ...yConvert.java => DockAircraftConvert.java} | 10 +-- ...ainEntityConvert.java => DockConvert.java} | 10 +-- ...tityConvert.java => DockGroupConvert.java} | 6 +- ...inEntityConvert.java => GroupConvert.java} | 6 +- ...EntityConvert.java => PayloadConvert.java} | 12 +-- .../domain/impl/AircraftDomainImpl.java | 14 ++-- .../impl/AircraftPayloadDomainImpl.java | 18 ++--- .../device/domain/impl/DeviceDomainImpl.java | 14 ++-- .../domain/impl/DockAircraftDomainImpl.java | 16 ++-- .../device/domain/impl/DockDomainImpl.java | 14 ++-- .../domain/impl/DockGroupDomainImpl.java | 16 ++-- .../device/domain/impl/GroupDomainImpl.java | 12 +-- .../device/domain/impl/PayloadDomainImpl.java | 12 +-- ...ceConvert.java => AircraftDTOConvert.java} | 6 +- ...rt.java => AircraftPayloadDTOConvert.java} | 6 +- ...viceConvert.java => DeviceDTOConvert.java} | 6 +- ...Convert.java => DeviceTempDTOConvert.java} | 6 +- ...nvert.java => DockAircraftDTOConvert.java} | 6 +- ...erviceConvert.java => DockDTOConvert.java} | 6 +- ...eConvert.java => DockGroupDTOConvert.java} | 6 +- ...rviceConvert.java => GroupDTOConvert.java} | 6 +- ...iceConvert.java => PayloadDTOConvert.java} | 6 +- .../impl/AircraftPayloadServiceImpl.java | 14 ++-- .../service/impl/AircraftServiceImpl.java | 8 +- .../device/service/impl/BufferDeviceImpl.java | 5 +- .../service/impl/DeviceServiceImpl.java | 13 +-- .../service/impl/DeviceTempServiceImpl.java | 8 +- .../service/impl/DockAircraftServiceImpl.java | 12 +-- .../service/impl/DockGroupServiceImpl.java | 12 +-- .../device/service/impl/DockServiceImpl.java | 12 +-- .../device/service/impl/GroupServiceImpl.java | 25 +++--- .../service/impl/PayloadServiceImpl.java | 8 +- 49 files changed, 312 insertions(+), 416 deletions(-) delete mode 100644 src/main/java/com/ruoyi/device/controller/convert/AircraftDetailDTOConvert.java create mode 100644 src/main/java/com/ruoyi/device/controller/convert/AircraftDetailVOConvert.java rename src/main/java/com/ruoyi/device/controller/convert/{DeviceTempControllerConvert.java => DeviceTempVOConvert.java} (82%) delete mode 100644 src/main/java/com/ruoyi/device/controller/convert/DockControllerConvert.java rename src/main/java/com/ruoyi/device/controller/convert/{DockDetailDTOConvert.java => DockDetailVOConvert.java} (89%) delete mode 100644 src/main/java/com/ruoyi/device/controller/convert/DockVOControllerConvert.java create mode 100644 src/main/java/com/ruoyi/device/controller/convert/DockVOConvert.java rename src/main/java/com/ruoyi/device/controller/convert/{GroupControllerConvert.java => GroupVOConvert.java} (82%) rename src/main/java/com/ruoyi/device/controller/convert/{NetworkControllerConvert.java => NetworkVOConvert.java} (52%) rename src/main/java/com/ruoyi/device/controller/convert/{PlayloadControllerConvert.java => PayloadDetailVOConvert.java} (77%) rename src/main/java/com/ruoyi/device/domain/convert/{AircraftDomainEntityConvert.java => AircraftConvert.java} (62%) rename src/main/java/com/ruoyi/device/domain/convert/{AircraftPayloadDomainEntityConvert.java => AircraftPayloadConvert.java} (67%) rename src/main/java/com/ruoyi/device/domain/convert/{DeviceDomainEntityConvert.java => DeviceConvert.java} (79%) rename src/main/java/com/ruoyi/device/domain/convert/{DockAircraftDomainEntityConvert.java => DockAircraftConvert.java} (68%) rename src/main/java/com/ruoyi/device/domain/convert/{DockDomainEntityConvert.java => DockConvert.java} (67%) rename src/main/java/com/ruoyi/device/domain/convert/{DockGroupDomainEntityConvert.java => DockGroupConvert.java} (78%) rename src/main/java/com/ruoyi/device/domain/convert/{GroupDomainEntityConvert.java => GroupConvert.java} (79%) rename src/main/java/com/ruoyi/device/domain/convert/{PayloadDomainEntityConvert.java => PayloadConvert.java} (62%) rename src/main/java/com/ruoyi/device/service/convert/{AircraftServiceConvert.java => AircraftDTOConvert.java} (83%) rename src/main/java/com/ruoyi/device/service/convert/{AircraftPayloadServiceConvert.java => AircraftPayloadDTOConvert.java} (81%) rename src/main/java/com/ruoyi/device/service/convert/{DeviceServiceConvert.java => DeviceDTOConvert.java} (83%) rename src/main/java/com/ruoyi/device/service/convert/{DeviceTempServiceConvert.java => DeviceTempDTOConvert.java} (82%) rename src/main/java/com/ruoyi/device/service/convert/{DockAircraftServiceConvert.java => DockAircraftDTOConvert.java} (82%) rename src/main/java/com/ruoyi/device/service/convert/{DockServiceConvert.java => DockDTOConvert.java} (84%) rename src/main/java/com/ruoyi/device/service/convert/{DockGroupServiceConvert.java => DockGroupDTOConvert.java} (82%) rename src/main/java/com/ruoyi/device/service/convert/{GroupServiceConvert.java => GroupDTOConvert.java} (83%) rename src/main/java/com/ruoyi/device/service/convert/{PayloadServiceConvert.java => PayloadDTOConvert.java} (83%) diff --git a/src/main/java/com/ruoyi/device/controller/AircraftController.java b/src/main/java/com/ruoyi/device/controller/AircraftController.java index 459d35c..156aff0 100644 --- a/src/main/java/com/ruoyi/device/controller/AircraftController.java +++ b/src/main/java/com/ruoyi/device/controller/AircraftController.java @@ -4,10 +4,9 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.device.api.domain.AircraftDetailVO; -import com.ruoyi.device.controller.convert.AircraftDetailDTOConvert; +import com.ruoyi.device.controller.convert.AircraftDetailVOConvert; import com.ruoyi.device.service.api.IAircraftService; import com.ruoyi.device.service.api.IBufferDeviceService; -import com.ruoyi.device.controller.convert.DockDetailDTOConvert; import com.ruoyi.device.service.dto.AircraftDetailDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -39,7 +38,7 @@ public class AircraftController extends BaseController public R getAircraftDetail(@PathVariable("aircraftId") Long aircraftId) { AircraftDetailDTO dto = bufferDeviceService.getAircraftDetailById(aircraftId); - AircraftDetailVO vo = AircraftDetailDTOConvert.from(dto); + AircraftDetailVO vo = AircraftDetailVOConvert.from(dto); return R.ok(vo); } } diff --git a/src/main/java/com/ruoyi/device/controller/DeviceTempController.java b/src/main/java/com/ruoyi/device/controller/DeviceTempController.java index 2c99912..7b5115a 100644 --- a/src/main/java/com/ruoyi/device/controller/DeviceTempController.java +++ b/src/main/java/com/ruoyi/device/controller/DeviceTempController.java @@ -6,7 +6,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.device.api.domain.DeviceTempVO; -import com.ruoyi.device.controller.convert.DeviceTempControllerConvert; +import com.ruoyi.device.controller.convert.DeviceTempVOConvert; import com.ruoyi.device.service.api.IDeviceTempService; import com.ruoyi.device.service.dto.DeviceTempDTO; import org.springframework.beans.factory.annotation.Autowired; @@ -38,10 +38,10 @@ public class DeviceTempController extends BaseController { startPage(); // API Domain → Service DTO - DeviceTempDTO dto = DeviceTempControllerConvert.to(deviceTemp); + DeviceTempDTO dto = DeviceTempVOConvert.to(deviceTemp); List dtoList = deviceTempService.selectDeviceTempList(dto); // Service DTO → API Domain - List list = DeviceTempControllerConvert.fromList(dtoList); + List list = DeviceTempVOConvert.fromList(dtoList); return getDataTable(list); } @@ -53,7 +53,7 @@ public class DeviceTempController extends BaseController public R getDeviceById(@PathVariable("id") String id) { DeviceTempDTO dto = deviceTempService.selectDeviceTempById(id); - DeviceTempVO deviceTemp = DeviceTempControllerConvert.from(dto); + DeviceTempVO deviceTemp = DeviceTempVOConvert.from(dto); return R.ok(deviceTemp); } @@ -64,7 +64,7 @@ public class DeviceTempController extends BaseController public AjaxResult getInfo(@PathVariable("id") String id) { DeviceTempDTO dto = deviceTempService.selectDeviceTempById(id); - DeviceTempVO deviceTemp = DeviceTempControllerConvert.from(dto); + DeviceTempVO deviceTemp = DeviceTempVOConvert.from(dto); return success(deviceTemp); } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/controller/DockController.java b/src/main/java/com/ruoyi/device/controller/DockController.java index 2b7dd11..2726bce 100644 --- a/src/main/java/com/ruoyi/device/controller/DockController.java +++ b/src/main/java/com/ruoyi/device/controller/DockController.java @@ -7,10 +7,10 @@ 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.DockDetailDTOConvert; +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.DockControllerConvert; +import com.ruoyi.device.controller.convert.DockVOConvert; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -44,7 +44,7 @@ public class DockController extends BaseController public R> searchDocks(@RequestParam(required = false) String dockStatus, @RequestParam(required = false) Long dockId) { List dtoList = dockService.searchDocks(dockStatus, dockId); - List voList = DockControllerConvert.fromList(dtoList); + List voList = DockVOConvert.fromList(dtoList); return R.ok(voList); } @@ -59,7 +59,7 @@ public class DockController extends BaseController public R getDockDetail(@PathVariable("dockId") Long dockId) { DockDetailDTO dto = bufferDeviceService.getDockDetailById(dockId); - DockDetailVO vo = DockDetailDTOConvert.from(dto); + DockDetailVO vo = DockDetailVOConvert.from(dto); return R.ok(vo); } } diff --git a/src/main/java/com/ruoyi/device/controller/GroupController.java b/src/main/java/com/ruoyi/device/controller/GroupController.java index 16e7f25..4ab3f5a 100644 --- a/src/main/java/com/ruoyi/device/controller/GroupController.java +++ b/src/main/java/com/ruoyi/device/controller/GroupController.java @@ -5,7 +5,7 @@ import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.device.api.domain.DockVO; import com.ruoyi.device.api.domain.GroupCreateRequest; import com.ruoyi.device.api.domain.SwitchDockGroupRequest; -import com.ruoyi.device.controller.convert.DockVOControllerConvert; +import com.ruoyi.device.controller.convert.DockVOConvert; import com.ruoyi.device.service.api.IBufferDeviceService; import com.ruoyi.device.service.api.IGroupService; import com.ruoyi.device.service.dto.DockDetailDTO; @@ -90,7 +90,8 @@ public class GroupController extends BaseController DockDetailDTO dockDetailDTO = bufferDeviceService.getDockDetailById(dockGroupDTO.getDockId()); dtoList.add(dockDetailDTO); } - return R.ok(DockVOControllerConvert.fromList(dtoList)); + + return R.ok(DockVOConvert.fromDockDetailDTOList(dtoList)); } /** diff --git a/src/main/java/com/ruoyi/device/controller/convert/AircraftDetailDTOConvert.java b/src/main/java/com/ruoyi/device/controller/convert/AircraftDetailDTOConvert.java deleted file mode 100644 index 458fdb2..0000000 --- a/src/main/java/com/ruoyi/device/controller/convert/AircraftDetailDTOConvert.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.ruoyi.device.controller.convert; - -import com.ruoyi.common.core.utils.BaseConvert; -import com.ruoyi.device.api.domain.AircraftDetailVO; -import com.ruoyi.device.service.dto.AircraftDetailDTO; - -import java.util.List; -import java.util.stream.Collectors; - -public class AircraftDetailDTOConvert extends BaseConvert -{ - - private static final AircraftDetailDTOConvert INSTANCE = new AircraftDetailDTOConvert(); - - private AircraftDetailDTOConvert() { - super(AircraftDetailDTO.class, AircraftDetailVO.class); - } - - public static AircraftDetailVO from(AircraftDetailDTO dto) - { - if (dto == null) - { - return null; - } - - AircraftDetailVO vo = new AircraftDetailVO(); - - vo.setAircraftId(dto.getAircraftId()); - vo.setAircraftName(dto.getAircraftName()); - vo.setManufacturerName(dto.getManufacturerName()); - vo.setAircraftVersion(dto.getAircraftVersion()); - vo.setSnNumber(dto.getSnNumber()); - vo.setBatterySn(dto.getBatterySn()); - vo.setBindTime(dto.getBindTime()); - vo.setMaintenanceDays(dto.getMaintenanceDays()); - vo.setFlightDuration(dto.getFlightDuration()); - vo.setMissionCount(dto.getMissionCount()); - vo.setRtkSignal(dto.getRtkSignal()); - vo.setMaxAltitude(dto.getMaxAltitude()); - vo.setMaxDistance(dto.getMaxDistance()); - vo.setVoltage(dto.getVoltage()); - vo.setBatteryLevel(dto.getBatteryLevel()); - vo.setFlightTimeRemaining(dto.getFlightTimeRemaining()); - vo.setBatteryTemperature(dto.getBatteryTemperature()); - vo.setCycleCount(dto.getCycleCount()); - - return vo; - } - - public static AircraftDetailDTO to(AircraftDetailVO vo) - { - return INSTANCE.innerTo(vo); - } - - public static List fromList(List dtoList) - { - if (dtoList == null) - { - return null; - } - return dtoList.stream().map(AircraftDetailDTOConvert::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/controller/convert/AircraftDetailVOConvert.java b/src/main/java/com/ruoyi/device/controller/convert/AircraftDetailVOConvert.java new file mode 100644 index 0000000..4963470 --- /dev/null +++ b/src/main/java/com/ruoyi/device/controller/convert/AircraftDetailVOConvert.java @@ -0,0 +1,39 @@ +package com.ruoyi.device.controller.convert; + +import com.ruoyi.common.core.utils.BaseConvert; +import com.ruoyi.device.api.domain.AircraftDetailVO; +import com.ruoyi.device.service.dto.AircraftDetailDTO; + +import java.util.List; +import java.util.stream.Collectors; + +public class AircraftDetailVOConvert extends BaseConvert +{ + + private static final AircraftDetailVOConvert INSTANCE = new AircraftDetailVOConvert(); + + private AircraftDetailVOConvert() { + super(AircraftDetailDTO.class, AircraftDetailVO.class); + } + + public static AircraftDetailVO from(AircraftDetailDTO dto) + { + return INSTANCE.innerFrom(dto); + } + + public static AircraftDetailDTO to(AircraftDetailVO vo) + { + return INSTANCE.innerTo(vo); + } + + public static List fromList(List dtoList) + { + return INSTANCE.innerFromList(dtoList); + } + + 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/controller/convert/DeviceTempControllerConvert.java b/src/main/java/com/ruoyi/device/controller/convert/DeviceTempVOConvert.java similarity index 82% rename from src/main/java/com/ruoyi/device/controller/convert/DeviceTempControllerConvert.java rename to src/main/java/com/ruoyi/device/controller/convert/DeviceTempVOConvert.java index 3186ab0..7760d53 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/DeviceTempControllerConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/DeviceTempVOConvert.java @@ -13,12 +13,12 @@ import java.util.List; * @author ruoyi * @date 2026-01-15 */ -public class DeviceTempControllerConvert extends BaseConvert +public class DeviceTempVOConvert extends BaseConvert { - private static final DeviceTempControllerConvert INSTANCE = new DeviceTempControllerConvert(); + private static final DeviceTempVOConvert INSTANCE = new DeviceTempVOConvert(); - private DeviceTempControllerConvert() { + private DeviceTempVOConvert() { super(DeviceTempDTO.class, DeviceTempVO.class); } diff --git a/src/main/java/com/ruoyi/device/controller/convert/DockControllerConvert.java b/src/main/java/com/ruoyi/device/controller/convert/DockControllerConvert.java deleted file mode 100644 index 1e8db1a..0000000 --- a/src/main/java/com/ruoyi/device/controller/convert/DockControllerConvert.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.ruoyi.device.controller.convert; - -import com.ruoyi.common.core.utils.BaseConvert; -import com.ruoyi.device.api.domain.DockVO; -import com.ruoyi.device.service.dto.DockDTO; - -import java.util.List; - -/** - * 机场Controller转换器 - * - * @author ruoyi - * @date 2026-01-20 - */ -public class DockControllerConvert extends BaseConvert -{ - - private static final DockControllerConvert INSTANCE = new DockControllerConvert(); - - private DockControllerConvert() { - super(DockDTO.class, DockVO.class); - } - - /** - * DTO 转 VO - */ - public static DockVO from(DockDTO dto) - { - return INSTANCE.innerFrom(dto); - } - - /** - * VO 转 DTO - */ - public static DockDTO to(DockVO vo) - { - return INSTANCE.innerTo(vo); - } - - /** - * DTO List 转 VO List - */ - public static List fromList(List dtoList) - { - return INSTANCE.innerFromList(dtoList); - } - - /** - * VO List 转 DTO List - */ - 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/controller/convert/DockDetailDTOConvert.java b/src/main/java/com/ruoyi/device/controller/convert/DockDetailVOConvert.java similarity index 89% rename from src/main/java/com/ruoyi/device/controller/convert/DockDetailDTOConvert.java rename to src/main/java/com/ruoyi/device/controller/convert/DockDetailVOConvert.java index 15e324e..34a6c77 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/DockDetailDTOConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/DockDetailVOConvert.java @@ -14,12 +14,12 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-20 */ -public class DockDetailDTOConvert extends BaseConvert +public class DockDetailVOConvert extends BaseConvert { - private static final DockDetailDTOConvert INSTANCE = new DockDetailDTOConvert(); + private static final DockDetailVOConvert INSTANCE = new DockDetailVOConvert(); - private DockDetailDTOConvert() { + private DockDetailVOConvert() { super(DockDetailDTO.class, DockDetailVO.class); } @@ -77,7 +77,7 @@ public class DockDetailDTOConvert extends BaseConvert toList(List voList) diff --git a/src/main/java/com/ruoyi/device/controller/convert/DockVOControllerConvert.java b/src/main/java/com/ruoyi/device/controller/convert/DockVOControllerConvert.java deleted file mode 100644 index 2f7d5b0..0000000 --- a/src/main/java/com/ruoyi/device/controller/convert/DockVOControllerConvert.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.ruoyi.device.controller.convert; - -import com.ruoyi.common.core.utils.BaseConvert; -import com.ruoyi.device.api.domain.DockVO; -import com.ruoyi.device.service.dto.DockDetailDTO; - -import java.util.List; - -public class DockVOControllerConvert extends BaseConvert -{ - - private static final DockVOControllerConvert INSTANCE = new DockVOControllerConvert(); - - private DockVOControllerConvert() { - super(DockDetailDTO.class, DockVO.class); - } - - /** - * DTO 转 API Domain - */ - public static DockVO from(DockDetailDTO dto) - { - return INSTANCE.innerFrom(dto); - } - - /** - * API Domain 转 DTO - */ - public static DockDetailDTO to(DockVO vo) - { - return INSTANCE.innerTo(vo); - } - - /** - * DTO List 转 API Domain List - */ - public static List fromList(List dtoList) - { - return INSTANCE.innerFromList(dtoList); - } - - /** - * API Domain List 转 DTO List - */ - 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/controller/convert/DockVOConvert.java b/src/main/java/com/ruoyi/device/controller/convert/DockVOConvert.java new file mode 100644 index 0000000..12b41dd --- /dev/null +++ b/src/main/java/com/ruoyi/device/controller/convert/DockVOConvert.java @@ -0,0 +1,80 @@ +package com.ruoyi.device.controller.convert; + +import com.ruoyi.common.core.utils.BaseConvert; +import com.ruoyi.device.api.domain.DockVO; +import com.ruoyi.device.service.dto.DockDTO; +import com.ruoyi.device.service.dto.DockDetailDTO; +import org.springframework.beans.BeanUtils; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * 机场Controller转换器 + * + * @author ruoyi + * @date 2026-01-20 + */ +public class DockVOConvert extends BaseConvert +{ + + private static final DockVOConvert INSTANCE = new DockVOConvert(); + + private DockVOConvert() { + super(DockDTO.class, DockVO.class); + } + + /** + * DTO 转 VO + */ + public static DockVO from(DockDTO dto) + { + return INSTANCE.innerFrom(dto); + } + + /** + * VO 转 DTO + */ + public static DockDTO to(DockVO vo) + { + return INSTANCE.innerTo(vo); + } + + /** + * DTO List 转 VO List + */ + public static List fromList(List dtoList) + { + return INSTANCE.innerFromList(dtoList); + } + + + /** + * DTO List 转 VO List + */ + public static List fromDockDetailDTOList(List sourceList) + { + if (sourceList == null) return null; + return sourceList.stream().map(DockVOConvert::fromDockDetailDTO).collect(Collectors.toList()); + } + + public static DockVO fromDockDetailDTO(DockDetailDTO source){ + if (source == null) return null; + try { + DockVO target = new DockVO(); + BeanUtils.copyProperties(source, target); + return target; + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + + /** + * VO List 转 DTO List + */ + 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/controller/convert/GroupControllerConvert.java b/src/main/java/com/ruoyi/device/controller/convert/GroupVOConvert.java similarity index 82% rename from src/main/java/com/ruoyi/device/controller/convert/GroupControllerConvert.java rename to src/main/java/com/ruoyi/device/controller/convert/GroupVOConvert.java index 177bf09..8943c77 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/GroupControllerConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/GroupVOConvert.java @@ -12,12 +12,12 @@ import java.util.List; * @author ruoyi * @date 2026-01-20 */ -public class GroupControllerConvert extends BaseConvert +public class GroupVOConvert extends BaseConvert { - private static final GroupControllerConvert INSTANCE = new GroupControllerConvert(); + private static final GroupVOConvert INSTANCE = new GroupVOConvert(); - private GroupControllerConvert() { + private GroupVOConvert() { super(GroupDTO.class, GroupVO.class); } diff --git a/src/main/java/com/ruoyi/device/controller/convert/NetworkControllerConvert.java b/src/main/java/com/ruoyi/device/controller/convert/NetworkVOConvert.java similarity index 52% rename from src/main/java/com/ruoyi/device/controller/convert/NetworkControllerConvert.java rename to src/main/java/com/ruoyi/device/controller/convert/NetworkVOConvert.java index 5ff951e..4d5ea39 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/NetworkControllerConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/NetworkVOConvert.java @@ -7,27 +7,18 @@ import com.ruoyi.device.service.dto.NetworkDTO; import java.util.List; import java.util.stream.Collectors; -public class NetworkControllerConvert extends BaseConvert +public class NetworkVOConvert extends BaseConvert { - private static final NetworkControllerConvert INSTANCE = new NetworkControllerConvert(); + private static final NetworkVOConvert INSTANCE = new NetworkVOConvert(); - private NetworkControllerConvert() { + private NetworkVOConvert() { super(NetworkDTO.class, NetworkVO.class); } public static NetworkVO from(NetworkDTO dto) { - if (dto == null) - { - return null; - } - - NetworkVO vo = new NetworkVO(); - vo.setNetworkType(dto.getNetworkType()); - vo.setNetworkDelay(dto.getNetworkDelay()); - - return vo; + return INSTANCE.innerFrom(dto); } public static NetworkDTO to(NetworkVO vo) @@ -37,11 +28,7 @@ public class NetworkControllerConvert extends BaseConvert public static List fromList(List dtoList) { - if (dtoList == null) - { - return null; - } - return dtoList.stream().map(NetworkControllerConvert::from).collect(Collectors.toList()); + return INSTANCE.innerFromList(dtoList); } public static List toList(List voList) diff --git a/src/main/java/com/ruoyi/device/controller/convert/PlayloadControllerConvert.java b/src/main/java/com/ruoyi/device/controller/convert/PayloadDetailVOConvert.java similarity index 77% rename from src/main/java/com/ruoyi/device/controller/convert/PlayloadControllerConvert.java rename to src/main/java/com/ruoyi/device/controller/convert/PayloadDetailVOConvert.java index c33fdff..33c1eae 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/PlayloadControllerConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/PayloadDetailVOConvert.java @@ -6,12 +6,12 @@ import com.ruoyi.device.service.dto.PayloadDTO; import java.util.List; -public class PlayloadControllerConvert extends BaseConvert +public class PayloadDetailVOConvert extends BaseConvert { - private static final PlayloadControllerConvert INSTANCE = new PlayloadControllerConvert(); + private static final PayloadDetailVOConvert INSTANCE = new PayloadDetailVOConvert(); - private PlayloadControllerConvert() { + private PayloadDetailVOConvert() { super(PayloadDTO.class, PayloadDetailVO.class); } diff --git a/src/main/java/com/ruoyi/device/domain/convert/AircraftDomainEntityConvert.java b/src/main/java/com/ruoyi/device/domain/convert/AircraftConvert.java similarity index 62% rename from src/main/java/com/ruoyi/device/domain/convert/AircraftDomainEntityConvert.java rename to src/main/java/com/ruoyi/device/domain/convert/AircraftConvert.java index 03336c0..3edb52e 100644 --- a/src/main/java/com/ruoyi/device/domain/convert/AircraftDomainEntityConvert.java +++ b/src/main/java/com/ruoyi/device/domain/convert/AircraftConvert.java @@ -2,15 +2,9 @@ package com.ruoyi.device.domain.convert; import com.ruoyi.common.core.utils.BaseConvert; import com.ruoyi.device.domain.model.Aircraft; -import com.ruoyi.device.domain.model.Device; -import com.ruoyi.device.domain.model.DockGroup; import com.ruoyi.device.mapper.entity.AircraftEntity; -import com.ruoyi.device.mapper.entity.DeviceEntity; -import com.ruoyi.device.mapper.entity.DockGroupEntity; -import org.springframework.beans.BeanUtils; import java.util.List; -import java.util.stream.Collectors; /** * 无人机Domain层转换器 @@ -19,11 +13,11 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-16 */ -public class AircraftDomainEntityConvert extends BaseConvert { +public class AircraftConvert extends BaseConvert { - private static final AircraftDomainEntityConvert INSTANCE = new AircraftDomainEntityConvert(); + private static final AircraftConvert INSTANCE = new AircraftConvert(); - private AircraftDomainEntityConvert() { + private AircraftConvert() { super(AircraftEntity.class, Aircraft.class); } diff --git a/src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadDomainEntityConvert.java b/src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadConvert.java similarity index 67% rename from src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadDomainEntityConvert.java rename to src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadConvert.java index 6ac20f6..1dab6e4 100644 --- a/src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadDomainEntityConvert.java +++ b/src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadConvert.java @@ -1,14 +1,10 @@ package com.ruoyi.device.domain.convert; import com.ruoyi.common.core.utils.BaseConvert; -import com.ruoyi.device.domain.model.Aircraft; import com.ruoyi.device.domain.model.AircraftPayload; -import com.ruoyi.device.mapper.entity.AircraftEntity; import com.ruoyi.device.mapper.entity.AircraftPayloadEntity; -import org.springframework.beans.BeanUtils; import java.util.List; -import java.util.stream.Collectors; /** * 无人机挂载关联Domain层转换器 @@ -17,11 +13,11 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-16 */ -public class AircraftPayloadDomainEntityConvert extends BaseConvert { +public class AircraftPayloadConvert extends BaseConvert { - private static final AircraftPayloadDomainEntityConvert INSTANCE = new AircraftPayloadDomainEntityConvert(); + private static final AircraftPayloadConvert INSTANCE = new AircraftPayloadConvert(); - private AircraftPayloadDomainEntityConvert() { + private AircraftPayloadConvert() { super(AircraftPayloadEntity.class, AircraftPayload.class); } diff --git a/src/main/java/com/ruoyi/device/domain/convert/DeviceDomainEntityConvert.java b/src/main/java/com/ruoyi/device/domain/convert/DeviceConvert.java similarity index 79% rename from src/main/java/com/ruoyi/device/domain/convert/DeviceDomainEntityConvert.java rename to src/main/java/com/ruoyi/device/domain/convert/DeviceConvert.java index b9811ff..f4a5cf2 100644 --- a/src/main/java/com/ruoyi/device/domain/convert/DeviceDomainEntityConvert.java +++ b/src/main/java/com/ruoyi/device/domain/convert/DeviceConvert.java @@ -13,11 +13,11 @@ import java.util.List; * @author ruoyi * @date 2026-01-16 */ -public class DeviceDomainEntityConvert extends BaseConvert { +public class DeviceConvert extends BaseConvert { - private static final DeviceDomainEntityConvert INSTANCE = new DeviceDomainEntityConvert(); + private static final DeviceConvert INSTANCE = new DeviceConvert(); - private DeviceDomainEntityConvert() { + private DeviceConvert() { super(DeviceEntity.class, Device.class); } diff --git a/src/main/java/com/ruoyi/device/domain/convert/DockAircraftDomainEntityConvert.java b/src/main/java/com/ruoyi/device/domain/convert/DockAircraftConvert.java similarity index 68% rename from src/main/java/com/ruoyi/device/domain/convert/DockAircraftDomainEntityConvert.java rename to src/main/java/com/ruoyi/device/domain/convert/DockAircraftConvert.java index a1b5ff2..371b4ed 100644 --- a/src/main/java/com/ruoyi/device/domain/convert/DockAircraftDomainEntityConvert.java +++ b/src/main/java/com/ruoyi/device/domain/convert/DockAircraftConvert.java @@ -1,14 +1,10 @@ package com.ruoyi.device.domain.convert; import com.ruoyi.common.core.utils.BaseConvert; -import com.ruoyi.device.domain.model.Dock; import com.ruoyi.device.domain.model.DockAircraft; import com.ruoyi.device.mapper.entity.DockAircraftEntity; -import com.ruoyi.device.mapper.entity.DockEntity; -import org.springframework.beans.BeanUtils; import java.util.List; -import java.util.stream.Collectors; /** * 机场无人机关联Domain层转换器 @@ -17,12 +13,12 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-16 */ -public class DockAircraftDomainEntityConvert extends BaseConvert +public class DockAircraftConvert extends BaseConvert { - private static final DockAircraftDomainEntityConvert INSTANCE = new DockAircraftDomainEntityConvert(); + private static final DockAircraftConvert INSTANCE = new DockAircraftConvert(); - private DockAircraftDomainEntityConvert() { + private DockAircraftConvert() { super(DockAircraftEntity.class, DockAircraft.class); } diff --git a/src/main/java/com/ruoyi/device/domain/convert/DockDomainEntityConvert.java b/src/main/java/com/ruoyi/device/domain/convert/DockConvert.java similarity index 67% rename from src/main/java/com/ruoyi/device/domain/convert/DockDomainEntityConvert.java rename to src/main/java/com/ruoyi/device/domain/convert/DockConvert.java index f3db4e3..ff84d20 100644 --- a/src/main/java/com/ruoyi/device/domain/convert/DockDomainEntityConvert.java +++ b/src/main/java/com/ruoyi/device/domain/convert/DockConvert.java @@ -2,13 +2,9 @@ package com.ruoyi.device.domain.convert; import com.ruoyi.common.core.utils.BaseConvert; import com.ruoyi.device.domain.model.Dock; -import com.ruoyi.device.domain.model.Payload; import com.ruoyi.device.mapper.entity.DockEntity; -import com.ruoyi.device.mapper.entity.PayloadEntity; -import org.springframework.beans.BeanUtils; import java.util.List; -import java.util.stream.Collectors; /** * 机场Domain层转换器 @@ -17,12 +13,12 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-16 */ -public class DockDomainEntityConvert extends BaseConvert +public class DockConvert extends BaseConvert { - private static final DockDomainEntityConvert INSTANCE = new DockDomainEntityConvert(); + private static final DockConvert INSTANCE = new DockConvert(); - private DockDomainEntityConvert() { + private DockConvert() { super(DockEntity.class, Dock.class); } diff --git a/src/main/java/com/ruoyi/device/domain/convert/DockGroupDomainEntityConvert.java b/src/main/java/com/ruoyi/device/domain/convert/DockGroupConvert.java similarity index 78% rename from src/main/java/com/ruoyi/device/domain/convert/DockGroupDomainEntityConvert.java rename to src/main/java/com/ruoyi/device/domain/convert/DockGroupConvert.java index 485566d..2adb6c3 100644 --- a/src/main/java/com/ruoyi/device/domain/convert/DockGroupDomainEntityConvert.java +++ b/src/main/java/com/ruoyi/device/domain/convert/DockGroupConvert.java @@ -13,11 +13,11 @@ import java.util.List; * @author ruoyi * @date 2026-01-16 */ -public class DockGroupDomainEntityConvert extends BaseConvert { +public class DockGroupConvert extends BaseConvert { - private static final DockGroupDomainEntityConvert INSTANCE = new DockGroupDomainEntityConvert(); + private static final DockGroupConvert INSTANCE = new DockGroupConvert(); - private DockGroupDomainEntityConvert() { + private DockGroupConvert() { super(DockGroupEntity.class, DockGroup.class); } diff --git a/src/main/java/com/ruoyi/device/domain/convert/GroupDomainEntityConvert.java b/src/main/java/com/ruoyi/device/domain/convert/GroupConvert.java similarity index 79% rename from src/main/java/com/ruoyi/device/domain/convert/GroupDomainEntityConvert.java rename to src/main/java/com/ruoyi/device/domain/convert/GroupConvert.java index 3058cf5..5899777 100644 --- a/src/main/java/com/ruoyi/device/domain/convert/GroupDomainEntityConvert.java +++ b/src/main/java/com/ruoyi/device/domain/convert/GroupConvert.java @@ -13,11 +13,11 @@ import java.util.List; * @author ruoyi * @date 2026-01-16 */ -public class GroupDomainEntityConvert extends BaseConvert { +public class GroupConvert extends BaseConvert { - private static final GroupDomainEntityConvert INSTANCE = new GroupDomainEntityConvert(); + private static final GroupConvert INSTANCE = new GroupConvert(); - private GroupDomainEntityConvert() { + private GroupConvert() { super(GroupEntity.class, Group.class); } diff --git a/src/main/java/com/ruoyi/device/domain/convert/PayloadDomainEntityConvert.java b/src/main/java/com/ruoyi/device/domain/convert/PayloadConvert.java similarity index 62% rename from src/main/java/com/ruoyi/device/domain/convert/PayloadDomainEntityConvert.java rename to src/main/java/com/ruoyi/device/domain/convert/PayloadConvert.java index 476ad5b..53993ec 100644 --- a/src/main/java/com/ruoyi/device/domain/convert/PayloadDomainEntityConvert.java +++ b/src/main/java/com/ruoyi/device/domain/convert/PayloadConvert.java @@ -1,16 +1,10 @@ package com.ruoyi.device.domain.convert; import com.ruoyi.common.core.utils.BaseConvert; -import com.ruoyi.device.domain.model.Aircraft; -import com.ruoyi.device.domain.model.Group; import com.ruoyi.device.domain.model.Payload; -import com.ruoyi.device.mapper.entity.AircraftEntity; -import com.ruoyi.device.mapper.entity.GroupEntity; import com.ruoyi.device.mapper.entity.PayloadEntity; -import org.springframework.beans.BeanUtils; import java.util.List; -import java.util.stream.Collectors; /** * 挂载Domain层转换器 @@ -19,12 +13,12 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-16 */ -public class PayloadDomainEntityConvert extends BaseConvert +public class PayloadConvert extends BaseConvert { - private static final PayloadDomainEntityConvert INSTANCE = new PayloadDomainEntityConvert(); + private static final PayloadConvert INSTANCE = new PayloadConvert(); - private PayloadDomainEntityConvert() { + private PayloadConvert() { super(PayloadEntity.class, Payload.class); } diff --git a/src/main/java/com/ruoyi/device/domain/impl/AircraftDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/AircraftDomainImpl.java index 07536bc..13cb3da 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/AircraftDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/AircraftDomainImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.device.domain.impl; import com.ruoyi.device.domain.api.IAircraftDomain; -import com.ruoyi.device.domain.convert.AircraftDomainEntityConvert; +import com.ruoyi.device.domain.convert.AircraftConvert; import com.ruoyi.device.domain.model.Aircraft; import com.ruoyi.device.mapper.AircraftMapper; import com.ruoyi.device.mapper.entity.AircraftEntity; @@ -28,29 +28,29 @@ public class AircraftDomainImpl implements IAircraftDomain @Override public List selectAircraftList(Aircraft aircraft) { - AircraftEntity entity = AircraftDomainEntityConvert.to(aircraft); + AircraftEntity entity = AircraftConvert.to(aircraft); List entityList = aircraftMapper.selectAircraftList(entity); - return AircraftDomainEntityConvert.fromList(entityList); + return AircraftConvert.fromList(entityList); } @Override public Aircraft selectAircraftByAircraftId(Long aircraftId) { AircraftEntity entity = aircraftMapper.selectAircraftByAircraftId(aircraftId); - return AircraftDomainEntityConvert.from(entity); + return AircraftConvert.from(entity); } @Override public Aircraft selectAircraftByDeviceId(Long deviceId) { AircraftEntity entity = aircraftMapper.selectAircraftByDeviceId(deviceId); - return AircraftDomainEntityConvert.from(entity); + return AircraftConvert.from(entity); } @Override public int insertAircraft(Aircraft aircraft) { - AircraftEntity entity = AircraftDomainEntityConvert.to(aircraft); + AircraftEntity entity = AircraftConvert.to(aircraft); int result = aircraftMapper.insertAircraft(entity); // MyBatis 会将自增主键回填到 entity 对象，需要同步回 aircraft 对象 aircraft.setAircraftId(entity.getAircraftId()); @@ -60,7 +60,7 @@ public class AircraftDomainImpl implements IAircraftDomain @Override public int updateAircraft(Aircraft aircraft) { - AircraftEntity entity = AircraftDomainEntityConvert.to(aircraft); + AircraftEntity entity = AircraftConvert.to(aircraft); return aircraftMapper.updateAircraft(entity); } diff --git a/src/main/java/com/ruoyi/device/domain/impl/AircraftPayloadDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/AircraftPayloadDomainImpl.java index 1ff3fec..4c654e7 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/AircraftPayloadDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/AircraftPayloadDomainImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.device.domain.impl; import com.ruoyi.device.domain.api.IAircraftPayloadDomain; -import com.ruoyi.device.domain.convert.AircraftPayloadDomainEntityConvert; +import com.ruoyi.device.domain.convert.AircraftPayloadConvert; import com.ruoyi.device.domain.model.AircraftPayload; import com.ruoyi.device.mapper.AircraftPayloadMapper; import com.ruoyi.device.mapper.entity.AircraftPayloadEntity; @@ -28,43 +28,43 @@ public class AircraftPayloadDomainImpl implements IAircraftPayloadDomain @Override public List selectAircraftPayloadList(AircraftPayload aircraftPayload) { - AircraftPayloadEntity entity = AircraftPayloadDomainEntityConvert.to(aircraftPayload); + AircraftPayloadEntity entity = AircraftPayloadConvert.to(aircraftPayload); List entityList = aircraftPayloadMapper.selectAircraftPayloadList(entity); - return AircraftPayloadDomainEntityConvert.fromList(entityList); + return AircraftPayloadConvert.fromList(entityList); } @Override public AircraftPayload selectAircraftPayloadById(Long id) { AircraftPayloadEntity entity = aircraftPayloadMapper.selectAircraftPayloadById(id); - return AircraftPayloadDomainEntityConvert.from(entity); + return AircraftPayloadConvert.from(entity); } @Override public List selectAircraftPayloadByAircraftId(Long aircraftId) { List entityList = aircraftPayloadMapper.selectAircraftPayloadListByAircraftId(aircraftId); - return AircraftPayloadDomainEntityConvert.fromList(entityList); + return AircraftPayloadConvert.fromList(entityList); } @Override public List selectAircraftPayloadByPayloadId(Long payloadId) { List entityList = aircraftPayloadMapper.selectAircraftPayloadListByPayloadId(payloadId); - return AircraftPayloadDomainEntityConvert.fromList(entityList); + return AircraftPayloadConvert.fromList(entityList); } @Override public List selectAircraftPayloadByDockId(Long dockId) { List entityList = aircraftPayloadMapper.selectAircraftPayloadListByDockId(dockId); - return AircraftPayloadDomainEntityConvert.fromList(entityList); + return AircraftPayloadConvert.fromList(entityList); } @Override public int insertAircraftPayload(AircraftPayload aircraftPayload) { - AircraftPayloadEntity entity = AircraftPayloadDomainEntityConvert.to(aircraftPayload); + AircraftPayloadEntity entity = AircraftPayloadConvert.to(aircraftPayload); int result = aircraftPayloadMapper.insertAircraftPayload(entity); // MyBatis 会将自增主键回填到 entity 对象，需要同步回 aircraftPayload 对象 aircraftPayload.setId(entity.getId()); @@ -74,7 +74,7 @@ public class AircraftPayloadDomainImpl implements IAircraftPayloadDomain @Override public int updateAircraftPayload(AircraftPayload aircraftPayload) { - AircraftPayloadEntity entity = AircraftPayloadDomainEntityConvert.to(aircraftPayload); + AircraftPayloadEntity entity = AircraftPayloadConvert.to(aircraftPayload); return aircraftPayloadMapper.updateAircraftPayload(entity); } diff --git a/src/main/java/com/ruoyi/device/domain/impl/DeviceDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/DeviceDomainImpl.java index 304607a..a251a4b 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/DeviceDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/DeviceDomainImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.device.domain.impl; import com.ruoyi.device.domain.api.IDeviceDomain; -import com.ruoyi.device.domain.convert.DeviceDomainEntityConvert; +import com.ruoyi.device.domain.convert.DeviceConvert; import com.ruoyi.device.domain.model.Device; import com.ruoyi.device.mapper.DeviceMapper; import com.ruoyi.device.mapper.entity.DeviceEntity; @@ -28,29 +28,29 @@ public class DeviceDomainImpl implements IDeviceDomain @Override public List selectDeviceList(Device device) { - DeviceEntity entity = DeviceDomainEntityConvert.to(device); + DeviceEntity entity = DeviceConvert.to(device); List entityList = deviceMapper.selectDeviceList(entity); - return DeviceDomainEntityConvert.fromList(entityList); + return DeviceConvert.fromList(entityList); } @Override public Device selectDeviceByDeviceId(Long deviceId) { DeviceEntity entity = deviceMapper.selectDeviceByDeviceId(deviceId); - return DeviceDomainEntityConvert.from(entity); + return DeviceConvert.from(entity); } @Override public Device selectDeviceByIotDeviceId(String iotDeviceId) { DeviceEntity entity = deviceMapper.selectDeviceByIotDeviceId(iotDeviceId); - return DeviceDomainEntityConvert.from(entity); + return DeviceConvert.from(entity); } @Override public int insertDevice(Device device) { - DeviceEntity entity = DeviceDomainEntityConvert.to(device); + DeviceEntity entity = DeviceConvert.to(device); int result = deviceMapper.insertDevice(entity); // MyBatis 会将自增主键回填到 entity 对象，需要同步回 device 对象 device.setDeviceId(entity.getDeviceId()); @@ -60,7 +60,7 @@ public class DeviceDomainImpl implements IDeviceDomain @Override public int updateDevice(Device device) { - DeviceEntity entity = DeviceDomainEntityConvert.to(device); + DeviceEntity entity = DeviceConvert.to(device); return deviceMapper.updateDevice(entity); } diff --git a/src/main/java/com/ruoyi/device/domain/impl/DockAircraftDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/DockAircraftDomainImpl.java index 7f4f699..d4a649f 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/DockAircraftDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/DockAircraftDomainImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.device.domain.impl; import com.ruoyi.device.domain.api.IDockAircraftDomain; -import com.ruoyi.device.domain.convert.DockAircraftDomainEntityConvert; +import com.ruoyi.device.domain.convert.DockAircraftConvert; import com.ruoyi.device.domain.model.DockAircraft; import com.ruoyi.device.mapper.DockAircraftMapper; import com.ruoyi.device.mapper.entity.DockAircraftEntity; @@ -28,36 +28,36 @@ public class DockAircraftDomainImpl implements IDockAircraftDomain @Override public List selectDockAircraftList(DockAircraft dockAircraft) { - DockAircraftEntity entity = DockAircraftDomainEntityConvert.to(dockAircraft); + DockAircraftEntity entity = DockAircraftConvert.to(dockAircraft); List entityList = dockAircraftMapper.selectDockAircraftList(entity); - return DockAircraftDomainEntityConvert.fromList(entityList); + return DockAircraftConvert.fromList(entityList); } @Override public DockAircraft selectDockAircraftById(Long id) { DockAircraftEntity entity = dockAircraftMapper.selectDockAircraftById(id); - return DockAircraftDomainEntityConvert.from(entity); + return DockAircraftConvert.from(entity); } @Override public List selectDockAircraftByDockId(Long dockId) { List entityList = dockAircraftMapper.selectDockAircraftListByDockId(dockId); - return DockAircraftDomainEntityConvert.fromList(entityList); + return DockAircraftConvert.fromList(entityList); } @Override public List selectDockAircraftByAircraftId(Long aircraftId) { List entityList = dockAircraftMapper.selectDockAircraftListByAircraftId(aircraftId); - return DockAircraftDomainEntityConvert.fromList(entityList); + return DockAircraftConvert.fromList(entityList); } @Override public int insertDockAircraft(DockAircraft dockAircraft) { - DockAircraftEntity entity = DockAircraftDomainEntityConvert.to(dockAircraft); + DockAircraftEntity entity = DockAircraftConvert.to(dockAircraft); int result = dockAircraftMapper.insertDockAircraft(entity); // MyBatis 会将自增主键回填到 entity 对象，需要同步回 dockAircraft 对象 dockAircraft.setId(entity.getId()); @@ -67,7 +67,7 @@ public class DockAircraftDomainImpl implements IDockAircraftDomain @Override public int updateDockAircraft(DockAircraft dockAircraft) { - DockAircraftEntity entity = DockAircraftDomainEntityConvert.to(dockAircraft); + DockAircraftEntity entity = DockAircraftConvert.to(dockAircraft); return dockAircraftMapper.updateDockAircraft(entity); } diff --git a/src/main/java/com/ruoyi/device/domain/impl/DockDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/DockDomainImpl.java index 52beda9..246be03 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/DockDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/DockDomainImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.device.domain.impl; import com.ruoyi.device.domain.api.IDockDomain; -import com.ruoyi.device.domain.convert.DockDomainEntityConvert; +import com.ruoyi.device.domain.convert.DockConvert; import com.ruoyi.device.domain.model.Dock; import com.ruoyi.device.mapper.DockMapper; import com.ruoyi.device.mapper.entity.DockEntity; @@ -28,29 +28,29 @@ public class DockDomainImpl implements IDockDomain @Override public List selectDockList(Dock dock) { - DockEntity entity = DockDomainEntityConvert.to(dock); + DockEntity entity = DockConvert.to(dock); List entityList = dockMapper.selectDockList(entity); - return DockDomainEntityConvert.fromList(entityList); + return DockConvert.fromList(entityList); } @Override public Dock selectDockByDockId(Long dockId) { DockEntity entity = dockMapper.selectDockByDockId(dockId); - return DockDomainEntityConvert.from(entity); + return DockConvert.from(entity); } @Override public Dock selectDockByDeviceId(Long deviceId) { DockEntity entity = dockMapper.selectDockByDeviceId(deviceId); - return DockDomainEntityConvert.from(entity); + return DockConvert.from(entity); } @Override public int insertDock(Dock dock) { - DockEntity entity = DockDomainEntityConvert.to(dock); + DockEntity entity = DockConvert.to(dock); int result = dockMapper.insertDock(entity); // MyBatis 会将自增主键回填到 entity 对象，需要同步回 dock 对象 dock.setDockId(entity.getDockId()); @@ -60,7 +60,7 @@ public class DockDomainImpl implements IDockDomain @Override public int updateDock(Dock dock) { - DockEntity entity = DockDomainEntityConvert.to(dock); + DockEntity entity = DockConvert.to(dock); return dockMapper.updateDock(entity); } diff --git a/src/main/java/com/ruoyi/device/domain/impl/DockGroupDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/DockGroupDomainImpl.java index 0325bff..29d6274 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/DockGroupDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/DockGroupDomainImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.device.domain.impl; import com.ruoyi.device.domain.api.IDockGroupDomain; -import com.ruoyi.device.domain.convert.DockGroupDomainEntityConvert; +import com.ruoyi.device.domain.convert.DockGroupConvert; import com.ruoyi.device.domain.model.DockGroup; import com.ruoyi.device.mapper.DockGroupMapper; import com.ruoyi.device.mapper.entity.DockGroupEntity; @@ -28,36 +28,36 @@ public class DockGroupDomainImpl implements IDockGroupDomain @Override public List selectDockGroupList(DockGroup dockGroup) { - DockGroupEntity entity = DockGroupDomainEntityConvert.to(dockGroup); + DockGroupEntity entity = DockGroupConvert.to(dockGroup); List entityList = dockGroupMapper.selectDockGroupList(entity); - return DockGroupDomainEntityConvert.fromList(entityList); + return DockGroupConvert.fromList(entityList); } @Override public DockGroup selectDockGroupById(Long id) { DockGroupEntity entity = dockGroupMapper.selectDockGroupById(id); - return DockGroupDomainEntityConvert.from(entity); + return DockGroupConvert.from(entity); } @Override public List selectDockGroupByDockId(Long dockId) { List entityList = dockGroupMapper.selectDockGroupListByDockId(dockId); - return DockGroupDomainEntityConvert.fromList(entityList); + return DockGroupConvert.fromList(entityList); } @Override public List selectDockGroupByGroupId(Long groupId) { List entityList = dockGroupMapper.selectDockGroupListByGroupId(groupId); - return DockGroupDomainEntityConvert.fromList(entityList); + return DockGroupConvert.fromList(entityList); } @Override public int insertDockGroup(DockGroup dockGroup) { - DockGroupEntity entity = DockGroupDomainEntityConvert.to(dockGroup); + DockGroupEntity entity = DockGroupConvert.to(dockGroup); int result = dockGroupMapper.insertDockGroup(entity); // MyBatis 会将自增主键回填到 entity 对象，需要同步回 dockGroup 对象 dockGroup.setId(entity.getId()); @@ -67,7 +67,7 @@ public class DockGroupDomainImpl implements IDockGroupDomain @Override public int updateDockGroup(DockGroup dockGroup) { - DockGroupEntity entity = DockGroupDomainEntityConvert.to(dockGroup); + DockGroupEntity entity = DockGroupConvert.to(dockGroup); return dockGroupMapper.updateDockGroup(entity); } diff --git a/src/main/java/com/ruoyi/device/domain/impl/GroupDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/GroupDomainImpl.java index 41ca60a..8f516a3 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/GroupDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/GroupDomainImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.device.domain.impl; import com.ruoyi.device.domain.api.IGroupDomain; -import com.ruoyi.device.domain.convert.GroupDomainEntityConvert; +import com.ruoyi.device.domain.convert.GroupConvert; import com.ruoyi.device.domain.model.Group; import com.ruoyi.device.mapper.GroupMapper; import com.ruoyi.device.mapper.entity.GroupEntity; @@ -28,22 +28,22 @@ public class GroupDomainImpl implements IGroupDomain @Override public List selectGroupList(Group group) { - GroupEntity entity = GroupDomainEntityConvert.to(group); + GroupEntity entity = GroupConvert.to(group); List entityList = groupMapper.selectGroupList(entity); - return GroupDomainEntityConvert.fromList(entityList); + return GroupConvert.fromList(entityList); } @Override public Group selectGroupByGroupId(Long groupId) { GroupEntity entity = groupMapper.selectGroupByGroupId(groupId); - return GroupDomainEntityConvert.from(entity); + return GroupConvert.from(entity); } @Override public int insertGroup(Group group) { - GroupEntity entity = GroupDomainEntityConvert.to(group); + GroupEntity entity = GroupConvert.to(group); int result = groupMapper.insertGroup(entity); // MyBatis 会将自增主键回填到 entity 对象，需要同步回 group 对象 group.setGroupId(entity.getGroupId()); @@ -53,7 +53,7 @@ public class GroupDomainImpl implements IGroupDomain @Override public int updateGroup(Group group) { - GroupEntity entity = GroupDomainEntityConvert.to(group); + GroupEntity entity = GroupConvert.to(group); return groupMapper.updateGroup(entity); } diff --git a/src/main/java/com/ruoyi/device/domain/impl/PayloadDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/PayloadDomainImpl.java index a942eda..cf81a8f 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/PayloadDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/PayloadDomainImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.device.domain.impl; import com.ruoyi.device.domain.api.IPayloadDomain; -import com.ruoyi.device.domain.convert.PayloadDomainEntityConvert; +import com.ruoyi.device.domain.convert.PayloadConvert; import com.ruoyi.device.domain.model.Payload; import com.ruoyi.device.mapper.PayloadMapper; import com.ruoyi.device.mapper.entity.PayloadEntity; @@ -28,22 +28,22 @@ public class PayloadDomainImpl implements IPayloadDomain @Override public List selectPayloadList(Payload payload) { - PayloadEntity entity = PayloadDomainEntityConvert.to(payload); + PayloadEntity entity = PayloadConvert.to(payload); List entityList = payloadMapper.selectPayloadList(entity); - return PayloadDomainEntityConvert.fromList(entityList); + return PayloadConvert.fromList(entityList); } @Override public Payload selectPayloadByPayloadId(Long payloadId) { PayloadEntity entity = payloadMapper.selectPayloadByPayloadId(payloadId); - return PayloadDomainEntityConvert.from(entity); + return PayloadConvert.from(entity); } @Override public int insertPayload(Payload payload) { - PayloadEntity entity = PayloadDomainEntityConvert.to(payload); + PayloadEntity entity = PayloadConvert.to(payload); int result = payloadMapper.insertPayload(entity); // MyBatis 会将自增主键回填到 entity 对象，需要同步回 payload 对象 payload.setPayloadId(entity.getPayloadId()); @@ -53,7 +53,7 @@ public class PayloadDomainImpl implements IPayloadDomain @Override public int updatePayload(Payload payload) { - PayloadEntity entity = PayloadDomainEntityConvert.to(payload); + PayloadEntity entity = PayloadConvert.to(payload); return payloadMapper.updatePayload(entity); } diff --git a/src/main/java/com/ruoyi/device/service/convert/AircraftServiceConvert.java b/src/main/java/com/ruoyi/device/service/convert/AircraftDTOConvert.java similarity index 83% rename from src/main/java/com/ruoyi/device/service/convert/AircraftServiceConvert.java rename to src/main/java/com/ruoyi/device/service/convert/AircraftDTOConvert.java index 97016d6..493a49a 100644 --- a/src/main/java/com/ruoyi/device/service/convert/AircraftServiceConvert.java +++ b/src/main/java/com/ruoyi/device/service/convert/AircraftDTOConvert.java @@ -13,12 +13,12 @@ import java.util.List; * @author ruoyi * @date 2026-01-16 */ -public class AircraftServiceConvert extends BaseConvert +public class AircraftDTOConvert extends BaseConvert { - private static final AircraftServiceConvert INSTANCE = new AircraftServiceConvert(); + private static final AircraftDTOConvert INSTANCE = new AircraftDTOConvert(); - private AircraftServiceConvert() { + private AircraftDTOConvert() { super(Aircraft.class, AircraftDTO.class); } diff --git a/src/main/java/com/ruoyi/device/service/convert/AircraftPayloadServiceConvert.java b/src/main/java/com/ruoyi/device/service/convert/AircraftPayloadDTOConvert.java similarity index 81% rename from src/main/java/com/ruoyi/device/service/convert/AircraftPayloadServiceConvert.java rename to src/main/java/com/ruoyi/device/service/convert/AircraftPayloadDTOConvert.java index 4ee3792..a765034 100644 --- a/src/main/java/com/ruoyi/device/service/convert/AircraftPayloadServiceConvert.java +++ b/src/main/java/com/ruoyi/device/service/convert/AircraftPayloadDTOConvert.java @@ -13,12 +13,12 @@ import java.util.List; * @author ruoyi * @date 2026-01-16 */ -public class AircraftPayloadServiceConvert extends BaseConvert +public class AircraftPayloadDTOConvert extends BaseConvert { - private static final AircraftPayloadServiceConvert INSTANCE = new AircraftPayloadServiceConvert(); + private static final AircraftPayloadDTOConvert INSTANCE = new AircraftPayloadDTOConvert(); - private AircraftPayloadServiceConvert() { + private AircraftPayloadDTOConvert() { super(AircraftPayload.class, AircraftPayloadDTO.class); } diff --git a/src/main/java/com/ruoyi/device/service/convert/DeviceServiceConvert.java b/src/main/java/com/ruoyi/device/service/convert/DeviceDTOConvert.java similarity index 83% rename from src/main/java/com/ruoyi/device/service/convert/DeviceServiceConvert.java rename to src/main/java/com/ruoyi/device/service/convert/DeviceDTOConvert.java index a6e80fc..7995050 100644 --- a/src/main/java/com/ruoyi/device/service/convert/DeviceServiceConvert.java +++ b/src/main/java/com/ruoyi/device/service/convert/DeviceDTOConvert.java @@ -13,12 +13,12 @@ import java.util.List; * @author ruoyi * @date 2026-01-16 */ -public class DeviceServiceConvert extends BaseConvert +public class DeviceDTOConvert extends BaseConvert { - private static final DeviceServiceConvert INSTANCE = new DeviceServiceConvert(); + private static final DeviceDTOConvert INSTANCE = new DeviceDTOConvert(); - private DeviceServiceConvert() { + private DeviceDTOConvert() { super(Device.class, DeviceDTO.class); } diff --git a/src/main/java/com/ruoyi/device/service/convert/DeviceTempServiceConvert.java b/src/main/java/com/ruoyi/device/service/convert/DeviceTempDTOConvert.java similarity index 82% rename from src/main/java/com/ruoyi/device/service/convert/DeviceTempServiceConvert.java rename to src/main/java/com/ruoyi/device/service/convert/DeviceTempDTOConvert.java index 6f38089..0d8bad5 100644 --- a/src/main/java/com/ruoyi/device/service/convert/DeviceTempServiceConvert.java +++ b/src/main/java/com/ruoyi/device/service/convert/DeviceTempDTOConvert.java @@ -13,12 +13,12 @@ import java.util.List; * @author ruoyi * @date 2026-01-15 */ -public class DeviceTempServiceConvert extends BaseConvert +public class DeviceTempDTOConvert extends BaseConvert { - private static final DeviceTempServiceConvert INSTANCE = new DeviceTempServiceConvert(); + private static final DeviceTempDTOConvert INSTANCE = new DeviceTempDTOConvert(); - private DeviceTempServiceConvert() { + private DeviceTempDTOConvert() { super(DeviceTemp.class, DeviceTempDTO.class); } diff --git a/src/main/java/com/ruoyi/device/service/convert/DockAircraftServiceConvert.java b/src/main/java/com/ruoyi/device/service/convert/DockAircraftDTOConvert.java similarity index 82% rename from src/main/java/com/ruoyi/device/service/convert/DockAircraftServiceConvert.java rename to src/main/java/com/ruoyi/device/service/convert/DockAircraftDTOConvert.java index d8bb9df..4104f13 100644 --- a/src/main/java/com/ruoyi/device/service/convert/DockAircraftServiceConvert.java +++ b/src/main/java/com/ruoyi/device/service/convert/DockAircraftDTOConvert.java @@ -13,12 +13,12 @@ import java.util.List; * @author ruoyi * @date 2026-01-16 */ -public class DockAircraftServiceConvert extends BaseConvert +public class DockAircraftDTOConvert extends BaseConvert { - private static final DockAircraftServiceConvert INSTANCE = new DockAircraftServiceConvert(); + private static final DockAircraftDTOConvert INSTANCE = new DockAircraftDTOConvert(); - private DockAircraftServiceConvert() { + private DockAircraftDTOConvert() { super(DockAircraft.class, DockAircraftDTO.class); } diff --git a/src/main/java/com/ruoyi/device/service/convert/DockServiceConvert.java b/src/main/java/com/ruoyi/device/service/convert/DockDTOConvert.java similarity index 84% rename from src/main/java/com/ruoyi/device/service/convert/DockServiceConvert.java rename to src/main/java/com/ruoyi/device/service/convert/DockDTOConvert.java index 2efe9dc..b6febbd 100644 --- a/src/main/java/com/ruoyi/device/service/convert/DockServiceConvert.java +++ b/src/main/java/com/ruoyi/device/service/convert/DockDTOConvert.java @@ -13,12 +13,12 @@ import java.util.List; * @author ruoyi * @date 2026-01-16 */ -public class DockServiceConvert extends BaseConvert +public class DockDTOConvert extends BaseConvert { - private static final DockServiceConvert INSTANCE = new DockServiceConvert(); + private static final DockDTOConvert INSTANCE = new DockDTOConvert(); - private DockServiceConvert() { + private DockDTOConvert() { super(Dock.class, DockDTO.class); } diff --git a/src/main/java/com/ruoyi/device/service/convert/DockGroupServiceConvert.java b/src/main/java/com/ruoyi/device/service/convert/DockGroupDTOConvert.java similarity index 82% rename from src/main/java/com/ruoyi/device/service/convert/DockGroupServiceConvert.java rename to src/main/java/com/ruoyi/device/service/convert/DockGroupDTOConvert.java index 74d34c3..3cb4951 100644 --- a/src/main/java/com/ruoyi/device/service/convert/DockGroupServiceConvert.java +++ b/src/main/java/com/ruoyi/device/service/convert/DockGroupDTOConvert.java @@ -13,12 +13,12 @@ import java.util.List; * @author ruoyi * @date 2026-01-16 */ -public class DockGroupServiceConvert extends BaseConvert +public class DockGroupDTOConvert extends BaseConvert { - private static final DockGroupServiceConvert INSTANCE = new DockGroupServiceConvert(); + private static final DockGroupDTOConvert INSTANCE = new DockGroupDTOConvert(); - private DockGroupServiceConvert() { + private DockGroupDTOConvert() { super(DockGroup.class, DockGroupDTO.class); } diff --git a/src/main/java/com/ruoyi/device/service/convert/GroupServiceConvert.java b/src/main/java/com/ruoyi/device/service/convert/GroupDTOConvert.java similarity index 83% rename from src/main/java/com/ruoyi/device/service/convert/GroupServiceConvert.java rename to src/main/java/com/ruoyi/device/service/convert/GroupDTOConvert.java index c0e2d06..20a6265 100644 --- a/src/main/java/com/ruoyi/device/service/convert/GroupServiceConvert.java +++ b/src/main/java/com/ruoyi/device/service/convert/GroupDTOConvert.java @@ -13,12 +13,12 @@ import java.util.List; * @author ruoyi * @date 2026-01-16 */ -public class GroupServiceConvert extends BaseConvert +public class GroupDTOConvert extends BaseConvert { - private static final GroupServiceConvert INSTANCE = new GroupServiceConvert(); + private static final GroupDTOConvert INSTANCE = new GroupDTOConvert(); - private GroupServiceConvert() { + private GroupDTOConvert() { super(Group.class, GroupDTO.class); } diff --git a/src/main/java/com/ruoyi/device/service/convert/PayloadServiceConvert.java b/src/main/java/com/ruoyi/device/service/convert/PayloadDTOConvert.java similarity index 83% rename from src/main/java/com/ruoyi/device/service/convert/PayloadServiceConvert.java rename to src/main/java/com/ruoyi/device/service/convert/PayloadDTOConvert.java index 74c88d8..7d0f56d 100644 --- a/src/main/java/com/ruoyi/device/service/convert/PayloadServiceConvert.java +++ b/src/main/java/com/ruoyi/device/service/convert/PayloadDTOConvert.java @@ -13,12 +13,12 @@ import java.util.List; * @author ruoyi * @date 2026-01-16 */ -public class PayloadServiceConvert extends BaseConvert +public class PayloadDTOConvert extends BaseConvert { - private static final PayloadServiceConvert INSTANCE = new PayloadServiceConvert(); + private static final PayloadDTOConvert INSTANCE = new PayloadDTOConvert(); - private PayloadServiceConvert() { + private PayloadDTOConvert() { super(Payload.class, PayloadDTO.class); } diff --git a/src/main/java/com/ruoyi/device/service/impl/AircraftPayloadServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/AircraftPayloadServiceImpl.java index c6a9b42..5624d77 100644 --- a/src/main/java/com/ruoyi/device/service/impl/AircraftPayloadServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/AircraftPayloadServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.device.service.impl; import com.ruoyi.device.domain.api.IAircraftPayloadDomain; import com.ruoyi.device.domain.model.AircraftPayload; import com.ruoyi.device.service.api.IAircraftPayloadService; -import com.ruoyi.device.service.convert.AircraftPayloadServiceConvert; +import com.ruoyi.device.service.convert.AircraftPayloadDTOConvert; import com.ruoyi.device.service.dto.AircraftPayloadDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,36 +25,36 @@ public class AircraftPayloadServiceImpl implements IAircraftPayloadService @Override public List selectAircraftPayloadList(AircraftPayloadDTO aircraftPayloadDTO) { - AircraftPayload model = AircraftPayloadServiceConvert.to(aircraftPayloadDTO); + AircraftPayload model = AircraftPayloadDTOConvert.to(aircraftPayloadDTO); List modelList = aircraftPayloadDomain.selectAircraftPayloadList(model); - return AircraftPayloadServiceConvert.fromList(modelList); + return AircraftPayloadDTOConvert.fromList(modelList); } @Override public AircraftPayloadDTO selectAircraftPayloadById(Long id) { AircraftPayload model = aircraftPayloadDomain.selectAircraftPayloadById(id); - return AircraftPayloadServiceConvert.from(model); + return AircraftPayloadDTOConvert.from(model); } @Override public List selectAircraftPayloadByAircraftId(Long aircraftId) { List modelList = aircraftPayloadDomain.selectAircraftPayloadByAircraftId(aircraftId); - return AircraftPayloadServiceConvert.fromList(modelList); + return AircraftPayloadDTOConvert.fromList(modelList); } @Override public List selectAircraftPayloadByPayloadId(Long payloadId) { List modelList = aircraftPayloadDomain.selectAircraftPayloadByPayloadId(payloadId); - return AircraftPayloadServiceConvert.fromList(modelList); + return AircraftPayloadDTOConvert.fromList(modelList); } @Override public List selectAircraftPayloadByDockId(Long dockId) { List modelList = aircraftPayloadDomain.selectAircraftPayloadByDockId(dockId); - return AircraftPayloadServiceConvert.fromList(modelList); + return AircraftPayloadDTOConvert.fromList(modelList); } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/service/impl/AircraftServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/AircraftServiceImpl.java index eb30f4e..3da10d4 100644 --- a/src/main/java/com/ruoyi/device/service/impl/AircraftServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/AircraftServiceImpl.java @@ -4,7 +4,7 @@ import com.ruoyi.device.api.domain.AircraftDetailVO; import com.ruoyi.device.domain.api.IAircraftDomain; import com.ruoyi.device.domain.model.Aircraft; import com.ruoyi.device.service.api.IAircraftService; -import com.ruoyi.device.service.convert.AircraftServiceConvert; +import com.ruoyi.device.service.convert.AircraftDTOConvert; import com.ruoyi.device.service.dto.AircraftDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,16 +26,16 @@ public class AircraftServiceImpl implements IAircraftService @Override public List selectAircraftList(AircraftDTO aircraftDTO) { - Aircraft model = AircraftServiceConvert.to(aircraftDTO); + Aircraft model = AircraftDTOConvert.to(aircraftDTO); List modelList = aircraftDomain.selectAircraftList(model); - return AircraftServiceConvert.fromList(modelList); + return AircraftDTOConvert.fromList(modelList); } @Override public AircraftDTO selectAircraftByAircraftId(Long aircraftId) { Aircraft model = aircraftDomain.selectAircraftByAircraftId(aircraftId); - return AircraftServiceConvert.from(model); + return AircraftDTOConvert.from(model); } @Override diff --git a/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java b/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java index 2f42fb8..2b38922 100644 --- a/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java @@ -15,13 +15,12 @@ import com.ruoyi.device.domain.model.thingsboard.constants.DeviceTelemetry; import com.ruoyi.device.domain.model.thingsboard.attributes.battery.BatteryData; import com.ruoyi.device.domain.model.thingsboard.attributes.psdk.PsdkDevice; import com.ruoyi.device.service.api.IBufferDeviceService; -import com.ruoyi.device.service.api.IDeviceService; 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.convert.AircraftServiceConvert; +import com.ruoyi.device.service.convert.AircraftDTOConvert; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -107,7 +106,7 @@ public class BufferDeviceImpl implements IBufferDeviceService return null; } - AircraftDTO aircraftDTO = AircraftServiceConvert.from(aircraft); + AircraftDTO aircraftDTO = AircraftDTOConvert.from(aircraft); AircraftDetailDTO result = new AircraftDetailDTO(); diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java index 0bf0b1f..4920d3a 100644 --- a/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java @@ -3,20 +3,15 @@ package com.ruoyi.device.service.impl; import com.ruoyi.device.domain.api.IDeviceDomain; import com.ruoyi.device.domain.api.IThingsBoardDomain; import com.ruoyi.device.domain.model.Device; -import com.ruoyi.device.domain.model.thingsboard.AttributeMap; -import com.ruoyi.device.domain.model.thingsboard.DeviceInfo; -import com.ruoyi.device.domain.model.thingsboard.constants.DeviceAttributes; import com.ruoyi.device.service.api.IDeviceService; -import com.ruoyi.device.service.convert.DeviceServiceConvert; +import com.ruoyi.device.service.convert.DeviceDTOConvert; import com.ruoyi.device.service.dto.DeviceDTO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Optional; @Service public class DeviceServiceImpl implements IDeviceService { @@ -35,16 +30,16 @@ public class DeviceServiceImpl implements IDeviceService { @Override public List selectDeviceList(DeviceDTO deviceDTO) { - Device model = DeviceServiceConvert.to(deviceDTO); + Device model = DeviceDTOConvert.to(deviceDTO); List modelList = deviceDomain.selectDeviceList(model); - return DeviceServiceConvert.fromList(modelList); + return DeviceDTOConvert.fromList(modelList); } @Override public DeviceDTO selectDeviceByDeviceId(Long deviceId) { Device model = deviceDomain.selectDeviceByDeviceId(deviceId); - return DeviceServiceConvert.from(model); + return DeviceDTOConvert.from(model); } diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceTempServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceTempServiceImpl.java index bdb7ec2..95a7148 100644 --- a/src/main/java/com/ruoyi/device/service/impl/DeviceTempServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/DeviceTempServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.device.service.impl; import com.ruoyi.device.domain.api.IDeviceTempDomain; import com.ruoyi.device.domain.model.DeviceTemp; import com.ruoyi.device.service.api.IDeviceTempService; -import com.ruoyi.device.service.convert.DeviceTempServiceConvert; +import com.ruoyi.device.service.convert.DeviceTempDTOConvert; import com.ruoyi.device.service.dto.DeviceTempDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -31,9 +31,9 @@ public class DeviceTempServiceImpl implements IDeviceTempService @Override public List selectDeviceTempList(DeviceTempDTO deviceTempDTO) { - DeviceTemp model = DeviceTempServiceConvert.to(deviceTempDTO); + DeviceTemp model = DeviceTempDTOConvert.to(deviceTempDTO); List modelList = deviceTempDomain.selectDeviceTempList(model); - return DeviceTempServiceConvert.fromList(modelList); + return DeviceTempDTOConvert.fromList(modelList); } /** @@ -46,6 +46,6 @@ public class DeviceTempServiceImpl implements IDeviceTempService public DeviceTempDTO selectDeviceTempById(String id) { DeviceTemp model = deviceTempDomain.selectDeviceTempById(id); - return DeviceTempServiceConvert.from(model); + return DeviceTempDTOConvert.from(model); } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/service/impl/DockAircraftServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DockAircraftServiceImpl.java index e0140e0..ec2ab92 100644 --- a/src/main/java/com/ruoyi/device/service/impl/DockAircraftServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/DockAircraftServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.device.service.impl; import com.ruoyi.device.domain.api.IDockAircraftDomain; import com.ruoyi.device.domain.model.DockAircraft; import com.ruoyi.device.service.api.IDockAircraftService; -import com.ruoyi.device.service.convert.DockAircraftServiceConvert; +import com.ruoyi.device.service.convert.DockAircraftDTOConvert; import com.ruoyi.device.service.dto.DockAircraftDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,29 +25,29 @@ public class DockAircraftServiceImpl implements IDockAircraftService @Override public List selectDockAircraftList(DockAircraftDTO dockAircraftDTO) { - DockAircraft model = DockAircraftServiceConvert.to(dockAircraftDTO); + DockAircraft model = DockAircraftDTOConvert.to(dockAircraftDTO); List modelList = dockAircraftDomain.selectDockAircraftList(model); - return DockAircraftServiceConvert.fromList(modelList); + return DockAircraftDTOConvert.fromList(modelList); } @Override public DockAircraftDTO selectDockAircraftById(Long id) { DockAircraft model = dockAircraftDomain.selectDockAircraftById(id); - return DockAircraftServiceConvert.from(model); + return DockAircraftDTOConvert.from(model); } @Override public List selectDockAircraftByDockId(Long dockId) { List modelList = dockAircraftDomain.selectDockAircraftByDockId(dockId); - return DockAircraftServiceConvert.fromList(modelList); + return DockAircraftDTOConvert.fromList(modelList); } @Override public List selectDockAircraftByAircraftId(Long aircraftId) { List modelList = dockAircraftDomain.selectDockAircraftByAircraftId(aircraftId); - return DockAircraftServiceConvert.fromList(modelList); + return DockAircraftDTOConvert.fromList(modelList); } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/service/impl/DockGroupServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DockGroupServiceImpl.java index a320698..8f1608b 100644 --- a/src/main/java/com/ruoyi/device/service/impl/DockGroupServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/DockGroupServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.device.service.impl; import com.ruoyi.device.domain.api.IDockGroupDomain; import com.ruoyi.device.domain.model.DockGroup; import com.ruoyi.device.service.api.IDockGroupService; -import com.ruoyi.device.service.convert.DockGroupServiceConvert; +import com.ruoyi.device.service.convert.DockGroupDTOConvert; import com.ruoyi.device.service.dto.DockGroupDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,29 +25,29 @@ public class DockGroupServiceImpl implements IDockGroupService @Override public List selectDockGroupList(DockGroupDTO dockGroupDTO) { - DockGroup model = DockGroupServiceConvert.to(dockGroupDTO); + DockGroup model = DockGroupDTOConvert.to(dockGroupDTO); List modelList = dockGroupDomain.selectDockGroupList(model); - return DockGroupServiceConvert.fromList(modelList); + return DockGroupDTOConvert.fromList(modelList); } @Override public DockGroupDTO selectDockGroupById(Long id) { DockGroup model = dockGroupDomain.selectDockGroupById(id); - return DockGroupServiceConvert.from(model); + return DockGroupDTOConvert.from(model); } @Override public List selectDockGroupByDockId(Long dockId) { List modelList = dockGroupDomain.selectDockGroupByDockId(dockId); - return DockGroupServiceConvert.fromList(modelList); + return DockGroupDTOConvert.fromList(modelList); } @Override public List selectDockGroupByGroupId(Long groupId) { List modelList = dockGroupDomain.selectDockGroupByGroupId(groupId); - return DockGroupServiceConvert.fromList(modelList); + return DockGroupDTOConvert.fromList(modelList); } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/service/impl/DockServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DockServiceImpl.java index e05ff54..eff3883 100644 --- a/src/main/java/com/ruoyi/device/service/impl/DockServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/DockServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.device.service.impl; import com.ruoyi.device.domain.api.IDockDomain; import com.ruoyi.device.domain.model.Dock; import com.ruoyi.device.service.api.IDockService; -import com.ruoyi.device.service.convert.DockServiceConvert; +import com.ruoyi.device.service.convert.DockDTOConvert; import com.ruoyi.device.service.dto.DockDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,16 +25,16 @@ public class DockServiceImpl implements IDockService @Override public List selectDockList(DockDTO dockDTO) { - Dock model = DockServiceConvert.to(dockDTO); + Dock model = DockDTOConvert.to(dockDTO); List modelList = dockDomain.selectDockList(model); - return DockServiceConvert.fromList(modelList); + return DockDTOConvert.fromList(modelList); } @Override public DockDTO selectDockByDockId(Long dockId) { Dock model = dockDomain.selectDockByDockId(dockId); - return DockServiceConvert.from(model); + return DockDTOConvert.from(model); } @Override @@ -42,7 +42,7 @@ public class DockServiceImpl implements IDockService { DockDTO query = new DockDTO(); query.setDockId(dockId); - List modelList = dockDomain.selectDockList(DockServiceConvert.to(query)); - return DockServiceConvert.fromList(modelList); + List modelList = dockDomain.selectDockList(DockDTOConvert.to(query)); + return DockDTOConvert.fromList(modelList); } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/service/impl/GroupServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/GroupServiceImpl.java index 6685c4f..d3bec71 100644 --- a/src/main/java/com/ruoyi/device/service/impl/GroupServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/GroupServiceImpl.java @@ -1,29 +1,22 @@ package com.ruoyi.device.service.impl; import com.alibaba.fastjson.JSON; -import com.ruoyi.device.api.domain.DockVO; import com.ruoyi.device.domain.api.IGroupDomain; import com.ruoyi.device.domain.api.IDockGroupDomain; import com.ruoyi.device.domain.api.IDockDomain; import com.ruoyi.device.domain.model.DockGroup; import com.ruoyi.device.domain.model.Group; -import com.ruoyi.device.domain.model.Dock; import com.ruoyi.device.service.api.IGroupService; -import com.ruoyi.device.service.convert.DockGroupServiceConvert; -import com.ruoyi.device.service.convert.GroupServiceConvert; +import com.ruoyi.device.service.convert.DockGroupDTOConvert; +import com.ruoyi.device.service.convert.GroupDTOConvert; import com.ruoyi.device.service.dto.DockGroupDTO; import com.ruoyi.device.service.dto.GroupDTO; -import com.ruoyi.device.service.dto.DockDTO; -import com.ruoyi.device.service.convert.DockServiceConvert; -import com.ruoyi.device.api.domain.DockDetailVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** @@ -48,29 +41,29 @@ public class GroupServiceImpl implements IGroupService @Override public List selectGroupList(GroupDTO groupDTO) { - Group model = GroupServiceConvert.to(groupDTO); + Group model = GroupDTOConvert.to(groupDTO); List modelList = groupDomain.selectGroupList(model); - return GroupServiceConvert.fromList(modelList); + return GroupDTOConvert.fromList(modelList); } @Override public GroupDTO selectGroupByGroupId(Long groupId) { Group model = groupDomain.selectGroupByGroupId(groupId); - return GroupServiceConvert.from(model); + return GroupDTOConvert.from(model); } @Override public int insertGroup(GroupDTO groupDTO) { - Group model = GroupServiceConvert.to(groupDTO); + Group model = GroupDTOConvert.to(groupDTO); return groupDomain.insertGroup(model); } @Override public int updateGroup(GroupDTO groupDTO) { - Group model = GroupServiceConvert.to(groupDTO); + Group model = GroupDTOConvert.to(groupDTO); return groupDomain.updateGroup(model); } @@ -89,7 +82,7 @@ public class GroupServiceImpl implements IGroupService @Override public Long createGroup(GroupDTO groupDTO) { - Group model = GroupServiceConvert.to(groupDTO); + Group model = GroupDTOConvert.to(groupDTO); groupDomain.insertGroup(model); return model.getGroupId(); } @@ -130,7 +123,7 @@ public class GroupServiceImpl implements IGroupService { return List.of(); } - return DockGroupServiceConvert.fromList(dockGroupList); + return DockGroupDTOConvert.fromList(dockGroupList); } diff --git a/src/main/java/com/ruoyi/device/service/impl/PayloadServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/PayloadServiceImpl.java index e928242..fe0ac04 100644 --- a/src/main/java/com/ruoyi/device/service/impl/PayloadServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/PayloadServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.device.service.impl; import com.ruoyi.device.domain.api.IPayloadDomain; import com.ruoyi.device.domain.model.Payload; import com.ruoyi.device.service.api.IPayloadService; -import com.ruoyi.device.service.convert.PayloadServiceConvert; +import com.ruoyi.device.service.convert.PayloadDTOConvert; import com.ruoyi.device.service.dto.PayloadDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,15 +25,15 @@ public class PayloadServiceImpl implements IPayloadService @Override public List selectPayloadList(PayloadDTO payloadDTO) { - Payload model = PayloadServiceConvert.to(payloadDTO); + Payload model = PayloadDTOConvert.to(payloadDTO); List modelList = payloadDomain.selectPayloadList(model); - return PayloadServiceConvert.fromList(modelList); + return PayloadDTOConvert.fromList(modelList); } @Override public PayloadDTO selectPayloadByPayloadId(Long payloadId) { Payload model = payloadDomain.selectPayloadByPayloadId(payloadId); - return PayloadServiceConvert.from(model); + return PayloadDTOConvert.from(model); } } \ No newline at end of file