diff --git a/src/main/java/com/ruoyi/device/controller/AircraftController.java b/src/main/java/com/ruoyi/device/controller/AircraftController.java index 2743e7f..459d35c 100644 --- a/src/main/java/com/ruoyi/device/controller/AircraftController.java +++ b/src/main/java/com/ruoyi/device/controller/AircraftController.java @@ -39,7 +39,7 @@ public class AircraftController extends BaseController public R getAircraftDetail(@PathVariable("aircraftId") Long aircraftId) { AircraftDetailDTO dto = bufferDeviceService.getAircraftDetailById(aircraftId); - AircraftDetailVO vo = AircraftDetailDTOConvert.toVO(dto); + AircraftDetailVO vo = AircraftDetailDTOConvert.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 ee8cb11..2c99912 100644 --- a/src/main/java/com/ruoyi/device/controller/DeviceTempController.java +++ b/src/main/java/com/ruoyi/device/controller/DeviceTempController.java @@ -38,10 +38,10 @@ public class DeviceTempController extends BaseController { startPage(); // API Domain → Service DTO - DeviceTempDTO dto = DeviceTempControllerConvert.toDTO(deviceTemp); + DeviceTempDTO dto = DeviceTempControllerConvert.to(deviceTemp); List dtoList = deviceTempService.selectDeviceTempList(dto); // Service DTO → API Domain - List list = DeviceTempControllerConvert.toApiDomainList(dtoList); + List list = DeviceTempControllerConvert.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.toVO(dto); + DeviceTempVO deviceTemp = DeviceTempControllerConvert.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.toVO(dto); + DeviceTempVO deviceTemp = DeviceTempControllerConvert.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 c90129a..2b7dd11 100644 --- a/src/main/java/com/ruoyi/device/controller/DockController.java +++ b/src/main/java/com/ruoyi/device/controller/DockController.java @@ -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.toVOList(dtoList); + List voList = DockControllerConvert.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.toVO(dto); + DockDetailVO vo = DockDetailDTOConvert.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 25b6138..16e7f25 100644 --- a/src/main/java/com/ruoyi/device/controller/GroupController.java +++ b/src/main/java/com/ruoyi/device/controller/GroupController.java @@ -90,7 +90,7 @@ public class GroupController extends BaseController DockDetailDTO dockDetailDTO = bufferDeviceService.getDockDetailById(dockGroupDTO.getDockId()); dtoList.add(dockDetailDTO); } - return R.ok(DockVOControllerConvert.toVOList(dtoList)); + return R.ok(DockVOControllerConvert.fromList(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 index ff76d23..458fdb2 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/AircraftDetailDTOConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/AircraftDetailDTOConvert.java @@ -1,12 +1,22 @@ 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; -public class AircraftDetailDTOConvert { +import java.util.List; +import java.util.stream.Collectors; +public class AircraftDetailDTOConvert extends BaseConvert +{ - public static AircraftDetailVO toVO(AircraftDetailDTO dto) + private static final AircraftDetailDTOConvert INSTANCE = new AircraftDetailDTOConvert(); + + private AircraftDetailDTOConvert() { + super(AircraftDetailDTO.class, AircraftDetailVO.class); + } + + public static AircraftDetailVO from(AircraftDetailDTO dto) { if (dto == null) { @@ -25,7 +35,6 @@ public class AircraftDetailDTOConvert { vo.setMaintenanceDays(dto.getMaintenanceDays()); vo.setFlightDuration(dto.getFlightDuration()); vo.setMissionCount(dto.getMissionCount()); -// vo.setNetworkList(convertNetworkList(dto.getNetworkList())); vo.setRtkSignal(dto.getRtkSignal()); vo.setMaxAltitude(dto.getMaxAltitude()); vo.setMaxDistance(dto.getMaxDistance()); @@ -34,9 +43,27 @@ public class AircraftDetailDTOConvert { vo.setFlightTimeRemaining(dto.getFlightTimeRemaining()); vo.setBatteryTemperature(dto.getBatteryTemperature()); vo.setCycleCount(dto.getCycleCount()); -// vo.setPayloadList(convertPayloadList(dto.getPayloadList())); 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/DeviceTempControllerConvert.java b/src/main/java/com/ruoyi/device/controller/convert/DeviceTempControllerConvert.java index 16480be..3186ab0 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/DeviceTempControllerConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/DeviceTempControllerConvert.java @@ -1,11 +1,10 @@ package com.ruoyi.device.controller.convert; +import com.ruoyi.common.core.utils.BaseConvert; import com.ruoyi.device.api.domain.DeviceTempVO; import com.ruoyi.device.service.dto.DeviceTempDTO; -import org.springframework.beans.BeanUtils; import java.util.List; -import java.util.stream.Collectors; /** * 设备临时表Controller层转换器 @@ -14,45 +13,44 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-15 */ -public class DeviceTempControllerConvert +public class DeviceTempControllerConvert extends BaseConvert { + + private static final DeviceTempControllerConvert INSTANCE = new DeviceTempControllerConvert(); + + private DeviceTempControllerConvert() { + super(DeviceTempDTO.class, DeviceTempVO.class); + } + /** * DTO 转 API Domain */ - public static DeviceTempVO toVO(DeviceTempDTO dto) + public static DeviceTempVO from(DeviceTempDTO dto) { - if (dto == null) - { - return null; - } - DeviceTempVO apiDomain = new DeviceTempVO(); - BeanUtils.copyProperties(dto, apiDomain); - return apiDomain; + return INSTANCE.innerFrom(dto); } /** * API Domain 转 DTO */ - public static DeviceTempDTO toDTO(DeviceTempVO apiDomain) + public static DeviceTempDTO to(DeviceTempVO apiDomain) { - if (apiDomain == null) - { - return null; - } - DeviceTempDTO dto = new DeviceTempDTO(); - BeanUtils.copyProperties(apiDomain, dto); - return dto; + return INSTANCE.innerTo(apiDomain); } /** * DTO List 转 API Domain List */ - public static List toApiDomainList(List dtoList) + public static List fromList(List dtoList) { - if (dtoList == null) - { - return null; - } - return dtoList.stream().map(DeviceTempControllerConvert::toVO).collect(Collectors.toList()); + return INSTANCE.innerFromList(dtoList); + } + + /** + * API Domain List 转 DTO List + */ + public static List toList(List apiDomainList) + { + return INSTANCE.innerToList(apiDomainList); } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/controller/convert/DockControllerConvert.java b/src/main/java/com/ruoyi/device/controller/convert/DockControllerConvert.java index df1a3e2..1e8db1a 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/DockControllerConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/DockControllerConvert.java @@ -1,10 +1,9 @@ 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 org.springframework.beans.BeanUtils; -import java.util.ArrayList; import java.util.List; /** @@ -13,67 +12,44 @@ import java.util.List; * @author ruoyi * @date 2026-01-20 */ -public class DockControllerConvert +public class DockControllerConvert extends BaseConvert { + + private static final DockControllerConvert INSTANCE = new DockControllerConvert(); + + private DockControllerConvert() { + super(DockDTO.class, DockVO.class); + } + /** * DTO 转 VO */ - public static DockVO toVO(DockDTO dto) + public static DockVO from(DockDTO dto) { - if (dto == null) - { - return null; - } - DockVO vo = new DockVO(); - BeanUtils.copyProperties(dto, vo); - return vo; + return INSTANCE.innerFrom(dto); } /** * VO 转 DTO */ - public static DockDTO toDTO(DockVO vo) + public static DockDTO to(DockVO vo) { - if (vo == null) - { - return null; - } - DockDTO dto = new DockDTO(); - BeanUtils.copyProperties(vo, dto); - return dto; + return INSTANCE.innerTo(vo); } /** * DTO List 转 VO List */ - public static List toVOList(List dtoList) + public static List fromList(List dtoList) { - if (dtoList == null || dtoList.isEmpty()) - { - return new ArrayList<>(); - } - List voList = new ArrayList<>(); - for (DockDTO dto : dtoList) - { - voList.add(toVO(dto)); - } - return voList; + return INSTANCE.innerFromList(dtoList); } /** * VO List 转 DTO List */ - public static List toDTOList(List voList) + public static List toList(List voList) { - if (voList == null || voList.isEmpty()) - { - return new ArrayList<>(); - } - List dtoList = new ArrayList<>(); - for (DockVO vo : voList) - { - dtoList.add(toDTO(vo)); - } - return dtoList; + 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/DockDetailDTOConvert.java index 9fe3514..15e324e 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/DockDetailDTOConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/DockDetailDTOConvert.java @@ -1,8 +1,12 @@ 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 的转换 @@ -10,9 +14,16 @@ import com.ruoyi.device.service.dto.DockDetailDTO; * @author ruoyi * @date 2026-01-20 */ -public class DockDetailDTOConvert +public class DockDetailDTOConvert extends BaseConvert { - public static DockDetailVO toVO(DockDetailDTO dto) + + private static final DockDetailDTOConvert INSTANCE = new DockDetailDTOConvert(); + + private DockDetailDTOConvert() { + super(DockDetailDTO.class, DockDetailVO.class); + } + + public static DockDetailVO from(DockDetailDTO dto) { if (dto == null) { @@ -55,6 +66,23 @@ public class DockDetailDTOConvert 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(DockDetailDTOConvert::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/DockVOControllerConvert.java b/src/main/java/com/ruoyi/device/controller/convert/DockVOControllerConvert.java index 1a21768..2f7d5b0 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/DockVOControllerConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/DockVOControllerConvert.java @@ -1,40 +1,49 @@ package com.ruoyi.device.controller.convert; -import com.ruoyi.device.api.domain.DeviceTempVO; +import com.ruoyi.common.core.utils.BaseConvert; import com.ruoyi.device.api.domain.DockVO; -import com.ruoyi.device.service.dto.DeviceTempDTO; import com.ruoyi.device.service.dto.DockDetailDTO; -import org.springframework.beans.BeanUtils; import java.util.List; -import java.util.stream.Collectors; -public class DockVOControllerConvert { +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 toVO(DockDetailDTO source) + public static DockVO from(DockDetailDTO dto) { - if (source == null) - { - return null; - } - DockVO target = new DockVO(); - BeanUtils.copyProperties(source, target); - return target; + 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 toVOList(List sources) + public static List fromList(List dtoList) { - if (sources == null) - { - return null; - } - return sources.stream().map(DockVOControllerConvert::toVO).collect(Collectors.toList()); + 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/GroupControllerConvert.java b/src/main/java/com/ruoyi/device/controller/convert/GroupControllerConvert.java index a8a2f2f..177bf09 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/GroupControllerConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/GroupControllerConvert.java @@ -1,12 +1,9 @@ package com.ruoyi.device.controller.convert; -import com.ruoyi.device.api.domain.DockVO; +import com.ruoyi.common.core.utils.BaseConvert; import com.ruoyi.device.api.domain.GroupVO; -import com.ruoyi.device.service.dto.DockDTO; import com.ruoyi.device.service.dto.GroupDTO; -import org.springframework.beans.BeanUtils; -import java.util.ArrayList; import java.util.List; /** @@ -15,112 +12,44 @@ import java.util.List; * @author ruoyi * @date 2026-01-20 */ -public class GroupControllerConvert +public class GroupControllerConvert extends BaseConvert { - /** - * DTO 转 VO - */ - public static GroupVO toVO(GroupDTO dto) - { - if (dto == null) - { - return null; - } - GroupVO vo = new GroupVO(); - BeanUtils.copyProperties(dto, vo); - return vo; - } - /** - * VO 转 DTO - */ - public static GroupDTO toDTO(GroupVO vo) - { - if (vo == null) - { - return null; - } - GroupDTO dto = new GroupDTO(); - BeanUtils.copyProperties(vo, dto); - return dto; + private static final GroupControllerConvert INSTANCE = new GroupControllerConvert(); + + private GroupControllerConvert() { + super(GroupDTO.class, GroupVO.class); } /** * DTO 转 VO */ - public static DockVO toVO(DockDTO dto) + public static GroupVO from(GroupDTO dto) { - if (dto == null) - { - return null; - } - DockVO vo = new DockVO(); - BeanUtils.copyProperties(dto, vo); - return vo; + return INSTANCE.innerFrom(dto); } /** * VO 转 DTO */ - public static DockDTO toDTO(DockVO vo) + public static GroupDTO to(GroupVO vo) { - if (vo == null) - { - return null; - } - DockDTO dto = new DockDTO(); - BeanUtils.copyProperties(vo, dto); - return dto; + return INSTANCE.innerTo(vo); } /** * DTO List 转 VO List */ - public static List toVOList(List dtoList) + public static List fromList(List dtoList) { - if (dtoList == null || dtoList.isEmpty()) - { - return new ArrayList<>(); - } - List voList = new ArrayList<>(); - for (GroupDTO dto : dtoList) - { - voList.add(toVO(dto)); - } - return voList; - } - - /** - * Dock DTO List 转 Dock VO List - */ - public static List toDockVOList(List dtoList) - { - if (dtoList == null || dtoList.isEmpty()) - { - return new ArrayList<>(); - } - List voList = new ArrayList<>(); - for (DockDTO dto : dtoList) - { - voList.add(toVO(dto)); - } - return voList; + return INSTANCE.innerFromList(dtoList); } /** * VO List 转 DTO List */ - public static List toDTOList(List voList) + public static List toList(List voList) { - if (voList == null || voList.isEmpty()) - { - return new ArrayList<>(); - } - List dtoList = new ArrayList<>(); - for (GroupVO vo : voList) - { - dtoList.add(toDTO(vo)); - } - return dtoList; + return INSTANCE.innerToList(voList); } -} +} \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/controller/convert/NetworkControllerConvert.java b/src/main/java/com/ruoyi/device/controller/convert/NetworkControllerConvert.java index bce6d02..5ff951e 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/NetworkControllerConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/NetworkControllerConvert.java @@ -1,26 +1,22 @@ package com.ruoyi.device.controller.convert; +import com.ruoyi.common.core.utils.BaseConvert; import com.ruoyi.device.api.domain.NetworkVO; import com.ruoyi.device.service.dto.NetworkDTO; import java.util.List; import java.util.stream.Collectors; -public class NetworkControllerConvert { +public class NetworkControllerConvert extends BaseConvert +{ - private static List toList(List networkDTOList) - { - if (networkDTOList == null) - { - return null; - } + private static final NetworkControllerConvert INSTANCE = new NetworkControllerConvert(); - return networkDTOList.stream() - .map(NetworkControllerConvert::toVO) - .collect(Collectors.toList()); + private NetworkControllerConvert() { + super(NetworkDTO.class, NetworkVO.class); } - private static NetworkVO toVO(NetworkDTO dto) + public static NetworkVO from(NetworkDTO dto) { if (dto == null) { @@ -34,4 +30,23 @@ public class NetworkControllerConvert { return vo; } -} + public static NetworkDTO to(NetworkVO vo) + { + return INSTANCE.innerTo(vo); + } + + public static List fromList(List dtoList) + { + if (dtoList == null) + { + return null; + } + return dtoList.stream().map(NetworkControllerConvert::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/PlayloadControllerConvert.java b/src/main/java/com/ruoyi/device/controller/convert/PlayloadControllerConvert.java index 0abf5d5..c33fdff 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/PlayloadControllerConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/PlayloadControllerConvert.java @@ -1,35 +1,37 @@ package com.ruoyi.device.controller.convert; +import com.ruoyi.common.core.utils.BaseConvert; import com.ruoyi.device.api.domain.PayloadDetailVO; import com.ruoyi.device.service.dto.PayloadDTO; -import org.springframework.beans.BeanUtils; import java.util.List; -import java.util.stream.Collectors; -public class PlayloadControllerConvert { +public class PlayloadControllerConvert extends BaseConvert +{ - public static List toList(List payloadDTOList) - { - if (payloadDTOList == null) - { - return null; - } + private static final PlayloadControllerConvert INSTANCE = new PlayloadControllerConvert(); - return payloadDTOList.stream() - .map(PlayloadControllerConvert::to) - .collect(Collectors.toList()); + private PlayloadControllerConvert() { + super(PayloadDTO.class, PayloadDetailVO.class); } - public static PayloadDetailVO to(PayloadDTO source) + public static PayloadDetailVO from(PayloadDTO dto) { - if (source == null) - { - return null; - } - - PayloadDetailVO target = new PayloadDetailVO(); - BeanUtils.copyProperties(source, target); - return target; + return INSTANCE.innerFrom(dto); } -} + + public static PayloadDTO to(PayloadDetailVO 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/service/impl/AircraftPayloadServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/AircraftPayloadServiceImpl.java index d5b396c..c6a9b42 100644 --- a/src/main/java/com/ruoyi/device/service/impl/AircraftPayloadServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/AircraftPayloadServiceImpl.java @@ -25,36 +25,36 @@ public class AircraftPayloadServiceImpl implements IAircraftPayloadService @Override public List selectAircraftPayloadList(AircraftPayloadDTO aircraftPayloadDTO) { - AircraftPayload model = AircraftPayloadServiceConvert.toModel(aircraftPayloadDTO); + AircraftPayload model = AircraftPayloadServiceConvert.to(aircraftPayloadDTO); List modelList = aircraftPayloadDomain.selectAircraftPayloadList(model); - return AircraftPayloadServiceConvert.toDTOList(modelList); + return AircraftPayloadServiceConvert.fromList(modelList); } @Override public AircraftPayloadDTO selectAircraftPayloadById(Long id) { AircraftPayload model = aircraftPayloadDomain.selectAircraftPayloadById(id); - return AircraftPayloadServiceConvert.toDTO(model); + return AircraftPayloadServiceConvert.from(model); } @Override public List selectAircraftPayloadByAircraftId(Long aircraftId) { List modelList = aircraftPayloadDomain.selectAircraftPayloadByAircraftId(aircraftId); - return AircraftPayloadServiceConvert.toDTOList(modelList); + return AircraftPayloadServiceConvert.fromList(modelList); } @Override public List selectAircraftPayloadByPayloadId(Long payloadId) { List modelList = aircraftPayloadDomain.selectAircraftPayloadByPayloadId(payloadId); - return AircraftPayloadServiceConvert.toDTOList(modelList); + return AircraftPayloadServiceConvert.fromList(modelList); } @Override public List selectAircraftPayloadByDockId(Long dockId) { List modelList = aircraftPayloadDomain.selectAircraftPayloadByDockId(dockId); - return AircraftPayloadServiceConvert.toDTOList(modelList); + return AircraftPayloadServiceConvert.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 178cbf4..eb30f4e 100644 --- a/src/main/java/com/ruoyi/device/service/impl/AircraftServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/AircraftServiceImpl.java @@ -26,16 +26,16 @@ public class AircraftServiceImpl implements IAircraftService @Override public List selectAircraftList(AircraftDTO aircraftDTO) { - Aircraft model = AircraftServiceConvert.toModel(aircraftDTO); + Aircraft model = AircraftServiceConvert.to(aircraftDTO); List modelList = aircraftDomain.selectAircraftList(model); - return AircraftServiceConvert.toDTOList(modelList); + return AircraftServiceConvert.fromList(modelList); } @Override public AircraftDTO selectAircraftByAircraftId(Long aircraftId) { Aircraft model = aircraftDomain.selectAircraftByAircraftId(aircraftId); - return AircraftServiceConvert.toDTO(model); + return AircraftServiceConvert.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 6ef4330..2f42fb8 100644 --- a/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java @@ -107,7 +107,7 @@ public class BufferDeviceImpl implements IBufferDeviceService return null; } - AircraftDTO aircraftDTO = AircraftServiceConvert.toDTO(aircraft); + AircraftDTO aircraftDTO = AircraftServiceConvert.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 ef6226f..0bf0b1f 100644 --- a/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java @@ -35,16 +35,16 @@ public class DeviceServiceImpl implements IDeviceService { @Override public List selectDeviceList(DeviceDTO deviceDTO) { - Device model = DeviceServiceConvert.toModel(deviceDTO); + Device model = DeviceServiceConvert.to(deviceDTO); List modelList = deviceDomain.selectDeviceList(model); - return DeviceServiceConvert.toDTOList(modelList); + return DeviceServiceConvert.fromList(modelList); } @Override public DeviceDTO selectDeviceByDeviceId(Long deviceId) { Device model = deviceDomain.selectDeviceByDeviceId(deviceId); - return DeviceServiceConvert.toDTO(model); + return DeviceServiceConvert.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 5cf943e..bdb7ec2 100644 --- a/src/main/java/com/ruoyi/device/service/impl/DeviceTempServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/DeviceTempServiceImpl.java @@ -31,9 +31,9 @@ public class DeviceTempServiceImpl implements IDeviceTempService @Override public List selectDeviceTempList(DeviceTempDTO deviceTempDTO) { - DeviceTemp model = DeviceTempServiceConvert.toModel(deviceTempDTO); + DeviceTemp model = DeviceTempServiceConvert.to(deviceTempDTO); List modelList = deviceTempDomain.selectDeviceTempList(model); - return DeviceTempServiceConvert.toDTOList(modelList); + return DeviceTempServiceConvert.fromList(modelList); } /** @@ -46,6 +46,6 @@ public class DeviceTempServiceImpl implements IDeviceTempService public DeviceTempDTO selectDeviceTempById(String id) { DeviceTemp model = deviceTempDomain.selectDeviceTempById(id); - return DeviceTempServiceConvert.toDTO(model); + return DeviceTempServiceConvert.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 f08b5c7..e0140e0 100644 --- a/src/main/java/com/ruoyi/device/service/impl/DockAircraftServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/DockAircraftServiceImpl.java @@ -25,29 +25,29 @@ public class DockAircraftServiceImpl implements IDockAircraftService @Override public List selectDockAircraftList(DockAircraftDTO dockAircraftDTO) { - DockAircraft model = DockAircraftServiceConvert.toModel(dockAircraftDTO); + DockAircraft model = DockAircraftServiceConvert.to(dockAircraftDTO); List modelList = dockAircraftDomain.selectDockAircraftList(model); - return DockAircraftServiceConvert.toDTOList(modelList); + return DockAircraftServiceConvert.fromList(modelList); } @Override public DockAircraftDTO selectDockAircraftById(Long id) { DockAircraft model = dockAircraftDomain.selectDockAircraftById(id); - return DockAircraftServiceConvert.toDTO(model); + return DockAircraftServiceConvert.from(model); } @Override public List selectDockAircraftByDockId(Long dockId) { List modelList = dockAircraftDomain.selectDockAircraftByDockId(dockId); - return DockAircraftServiceConvert.toDTOList(modelList); + return DockAircraftServiceConvert.fromList(modelList); } @Override public List selectDockAircraftByAircraftId(Long aircraftId) { List modelList = dockAircraftDomain.selectDockAircraftByAircraftId(aircraftId); - return DockAircraftServiceConvert.toDTOList(modelList); + return DockAircraftServiceConvert.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 8af4895..a320698 100644 --- a/src/main/java/com/ruoyi/device/service/impl/DockGroupServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/DockGroupServiceImpl.java @@ -25,29 +25,29 @@ public class DockGroupServiceImpl implements IDockGroupService @Override public List selectDockGroupList(DockGroupDTO dockGroupDTO) { - DockGroup model = DockGroupServiceConvert.toModel(dockGroupDTO); + DockGroup model = DockGroupServiceConvert.to(dockGroupDTO); List modelList = dockGroupDomain.selectDockGroupList(model); - return DockGroupServiceConvert.toDTOList(modelList); + return DockGroupServiceConvert.fromList(modelList); } @Override public DockGroupDTO selectDockGroupById(Long id) { DockGroup model = dockGroupDomain.selectDockGroupById(id); - return DockGroupServiceConvert.toDTO(model); + return DockGroupServiceConvert.from(model); } @Override public List selectDockGroupByDockId(Long dockId) { List modelList = dockGroupDomain.selectDockGroupByDockId(dockId); - return DockGroupServiceConvert.toDTOList(modelList); + return DockGroupServiceConvert.fromList(modelList); } @Override public List selectDockGroupByGroupId(Long groupId) { List modelList = dockGroupDomain.selectDockGroupByGroupId(groupId); - return DockGroupServiceConvert.toDTOList(modelList); + return DockGroupServiceConvert.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 f79e8c1..e05ff54 100644 --- a/src/main/java/com/ruoyi/device/service/impl/DockServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/DockServiceImpl.java @@ -25,16 +25,16 @@ public class DockServiceImpl implements IDockService @Override public List selectDockList(DockDTO dockDTO) { - Dock model = DockServiceConvert.toModel(dockDTO); + Dock model = DockServiceConvert.to(dockDTO); List modelList = dockDomain.selectDockList(model); - return DockServiceConvert.toDTOList(modelList); + return DockServiceConvert.fromList(modelList); } @Override public DockDTO selectDockByDockId(Long dockId) { Dock model = dockDomain.selectDockByDockId(dockId); - return DockServiceConvert.toDTO(model); + return DockServiceConvert.from(model); } @Override @@ -42,7 +42,7 @@ public class DockServiceImpl implements IDockService { DockDTO query = new DockDTO(); query.setDockId(dockId); - List modelList = dockDomain.selectDockList(DockServiceConvert.toModel(query)); - return DockServiceConvert.toDTOList(modelList); + List modelList = dockDomain.selectDockList(DockServiceConvert.to(query)); + return DockServiceConvert.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 aabbe1b..6685c4f 100644 --- a/src/main/java/com/ruoyi/device/service/impl/GroupServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/GroupServiceImpl.java @@ -48,29 +48,29 @@ public class GroupServiceImpl implements IGroupService @Override public List selectGroupList(GroupDTO groupDTO) { - Group model = GroupServiceConvert.toModel(groupDTO); + Group model = GroupServiceConvert.to(groupDTO); List modelList = groupDomain.selectGroupList(model); - return GroupServiceConvert.toDTOList(modelList); + return GroupServiceConvert.fromList(modelList); } @Override public GroupDTO selectGroupByGroupId(Long groupId) { Group model = groupDomain.selectGroupByGroupId(groupId); - return GroupServiceConvert.toDTO(model); + return GroupServiceConvert.from(model); } @Override public int insertGroup(GroupDTO groupDTO) { - Group model = GroupServiceConvert.toModel(groupDTO); + Group model = GroupServiceConvert.to(groupDTO); return groupDomain.insertGroup(model); } @Override public int updateGroup(GroupDTO groupDTO) { - Group model = GroupServiceConvert.toModel(groupDTO); + Group model = GroupServiceConvert.to(groupDTO); return groupDomain.updateGroup(model); } @@ -89,7 +89,7 @@ public class GroupServiceImpl implements IGroupService @Override public Long createGroup(GroupDTO groupDTO) { - Group model = GroupServiceConvert.toModel(groupDTO); + Group model = GroupServiceConvert.to(groupDTO); groupDomain.insertGroup(model); return model.getGroupId(); } @@ -130,7 +130,7 @@ public class GroupServiceImpl implements IGroupService { return List.of(); } - return DockGroupServiceConvert.toDTOList(dockGroupList); + return DockGroupServiceConvert.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 ecae11b..e928242 100644 --- a/src/main/java/com/ruoyi/device/service/impl/PayloadServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/PayloadServiceImpl.java @@ -25,15 +25,15 @@ public class PayloadServiceImpl implements IPayloadService @Override public List selectPayloadList(PayloadDTO payloadDTO) { - Payload model = PayloadServiceConvert.toModel(payloadDTO); + Payload model = PayloadServiceConvert.to(payloadDTO); List modelList = payloadDomain.selectPayloadList(model); - return PayloadServiceConvert.toDTOList(modelList); + return PayloadServiceConvert.fromList(modelList); } @Override public PayloadDTO selectPayloadByPayloadId(Long payloadId) { Payload model = payloadDomain.selectPayloadByPayloadId(payloadId); - return PayloadServiceConvert.toDTO(model); + return PayloadServiceConvert.from(model); } } \ No newline at end of file