THENG
/
a-tuoheng-device
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改convert

This commit is contained in:
孙小云 2026-01-21 11:43:56 +08:00
parent aed2112e59
commit 518a2bff17
22 changed files with 248 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ruoyi/device/controller/AircraftController.java
View File

@ -39,7 +39,7 @@ public class AircraftController extends BaseController
public R<AircraftDetailVO> getAircraftDetail(@PathVariable("aircraftId") Long aircraftId)
{
AircraftDetailDTO dto = bufferDeviceService.getAircraftDetailById(aircraftId);
AircraftDetailVO vo = AircraftDetailDTOConvert.toVO(dto);
AircraftDetailVO vo = AircraftDetailDTOConvert.from(dto);
return R.ok(vo);
}
}

8
src/main/java/com/ruoyi/device/controller/DeviceTempController.java
View File

@ -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<DeviceTempDTO> dtoList = deviceTempService.selectDeviceTempList(dto);
// Service DTO → API Domain
List<DeviceTempVO> list = DeviceTempControllerConvert.toApiDomainList(dtoList);
List<DeviceTempVO> list = DeviceTempControllerConvert.fromList(dtoList);
return getDataTable(list);
}
@ -53,7 +53,7 @@ public class DeviceTempController extends BaseController
public R<DeviceTempVO> 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);
}
}

4
src/main/java/com/ruoyi/device/controller/DockController.java
View File

@ -44,7 +44,7 @@ public class DockController extends BaseController
public R<List<DockVO>> searchDocks(@RequestParam(required = false) String dockStatus, @RequestParam(required = false) Long dockId)
{
List<DockDTO> dtoList = dockService.searchDocks(dockStatus, dockId);
List<DockVO> voList = DockControllerConvert.toVOList(dtoList);
List<DockVO> voList = DockControllerConvert.fromList(dtoList);
return R.ok(voList);
}
@ -59,7 +59,7 @@ public class DockController extends BaseController
public R<DockDetailVO> getDockDetail(@PathVariable("dockId") Long dockId)
{
DockDetailDTO dto = bufferDeviceService.getDockDetailById(dockId);
DockDetailVO vo = DockDetailDTOConvert.toVO(dto);
DockDetailVO vo = DockDetailDTOConvert.from(dto);
return R.ok(vo);
}
}

2
src/main/java/com/ruoyi/device/controller/GroupController.java
View File

@ -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));
}
/**

35
src/main/java/com/ruoyi/device/controller/convert/AircraftDetailDTOConvert.java
View File

@ -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<AircraftDetailDTO, AircraftDetailVO>
{
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<AircraftDetailVO> fromList(List<AircraftDetailDTO> dtoList)
{
if (dtoList == null)
{
return null;
}
return dtoList.stream().map(AircraftDetailDTOConvert::from).collect(Collectors.toList());
}
public static List<AircraftDetailDTO> toList(List<AircraftDetailVO> voList)
{
return INSTANCE.innerToList(voList);
}
}

48
src/main/java/com/ruoyi/device/controller/convert/DeviceTempControllerConvert.java
View File

@ -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<DeviceTempDTO, DeviceTempVO>
{
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<DeviceTempVO> toApiDomainList(List<DeviceTempDTO> dtoList)
public static List<DeviceTempVO> fromList(List<DeviceTempDTO> 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<DeviceTempDTO> toList(List<DeviceTempVO> apiDomainList)
{
return INSTANCE.innerToList(apiDomainList);
}
}

58
src/main/java/com/ruoyi/device/controller/convert/DockControllerConvert.java
View File

@ -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<DockDTO, DockVO>
{
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<DockVO> toVOList(List<DockDTO> dtoList)
public static List<DockVO> fromList(List<DockDTO> dtoList)
{
if (dtoList == null || dtoList.isEmpty())
{
return new ArrayList<>();
}
List<DockVO> voList = new ArrayList<>();
for (DockDTO dto : dtoList)
{
voList.add(toVO(dto));
}
return voList;
return INSTANCE.innerFromList(dtoList);
}
/**
* VO List 转 DTO List
*/
public static List<DockDTO> toDTOList(List<DockVO> voList)
public static List<DockDTO> toList(List<DockVO> voList)
{
if (voList == null || voList.isEmpty())
{
return new ArrayList<>();
}
List<DockDTO> dtoList = new ArrayList<>();
for (DockVO vo : voList)
{
dtoList.add(toDTO(vo));
}
return dtoList;
return INSTANCE.innerToList(voList);
}
}

32
src/main/java/com/ruoyi/device/controller/convert/DockDetailDTOConvert.java
View File

@ -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<DockDetailDTO, DockDetailVO>
{
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<DockDetailVO> fromList(List<DockDetailDTO> dtoList)
{
if (dtoList == null)
{
return null;
}
return dtoList.stream().map(DockDetailDTOConvert::from).collect(Collectors.toList());
}
public static List<DockDetailDTO> toList(List<DockDetailVO> voList)
{
return INSTANCE.innerToList(voList);
}
}

47
src/main/java/com/ruoyi/device/controller/convert/DockVOControllerConvert.java
View File

@ -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<DockDetailDTO, DockVO>
{
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<DockVO> toVOList(List<DockDetailDTO> sources)
public static List<DockVO> fromList(List<DockDetailDTO> 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<DockDetailDTO> toList(List<DockVO> voList)
{
return INSTANCE.innerToList(voList);
}
}

99
src/main/java/com/ruoyi/device/controller/convert/GroupControllerConvert.java
View File

@ -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<GroupDTO, GroupVO>
{
/**
* 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<GroupVO> toVOList(List<GroupDTO> dtoList)
public static List<GroupVO> fromList(List<GroupDTO> dtoList)
{
if (dtoList == null || dtoList.isEmpty())
{
return new ArrayList<>();
}
List<GroupVO> voList = new ArrayList<>();
for (GroupDTO dto : dtoList)
{
voList.add(toVO(dto));
}
return voList;
}
/**
* Dock DTO List 转 Dock VO List
*/
public static List<DockVO> toDockVOList(List<DockDTO> dtoList)
{
if (dtoList == null || dtoList.isEmpty())
{
return new ArrayList<>();
}
List<DockVO> voList = new ArrayList<>();
for (DockDTO dto : dtoList)
{
voList.add(toVO(dto));
}
return voList;
return INSTANCE.innerFromList(dtoList);
}
/**
* VO List 转 DTO List
*/
public static List<GroupDTO> toDTOList(List<GroupVO> voList)
public static List<GroupDTO> toList(List<GroupVO> voList)
{
if (voList == null || voList.isEmpty())
{
return new ArrayList<>();
}
List<GroupDTO> dtoList = new ArrayList<>();
for (GroupVO vo : voList)
{
dtoList.add(toDTO(vo));
}
return dtoList;
return INSTANCE.innerToList(voList);
}
}

37
src/main/java/com/ruoyi/device/controller/convert/NetworkControllerConvert.java
View File

@ -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<NetworkDTO, NetworkVO>
{
private static List<NetworkVO> toList(List<NetworkDTO> 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<NetworkVO> fromList(List<NetworkDTO> dtoList)
{
if (dtoList == null)
{
return null;
}
return dtoList.stream().map(NetworkControllerConvert::from).collect(Collectors.toList());
}
public static List<NetworkDTO> toList(List<NetworkVO> voList)
{
return INSTANCE.innerToList(voList);
}
}

42
src/main/java/com/ruoyi/device/controller/convert/PlayloadControllerConvert.java
View File

@ -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<PayloadDTO, PayloadDetailVO>
{
public static List<PayloadDetailVO> toList(List<PayloadDTO> 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;
}
return INSTANCE.innerFrom(dto);
}
PayloadDetailVO target = new PayloadDetailVO();
BeanUtils.copyProperties(source, target);
return target;
public static PayloadDTO to(PayloadDetailVO vo)
{
return INSTANCE.innerTo(vo);
}
public static List<PayloadDetailVO> fromList(List<PayloadDTO> dtoList)
{
return INSTANCE.innerFromList(dtoList);
}
public static List<PayloadDTO> toList(List<PayloadDetailVO> voList)
{
return INSTANCE.innerToList(voList);
}
}

12
src/main/java/com/ruoyi/device/service/impl/AircraftPayloadServiceImpl.java
View File

@ -25,36 +25,36 @@ public class AircraftPayloadServiceImpl implements IAircraftPayloadService
@Override
public List<AircraftPayloadDTO> selectAircraftPayloadList(AircraftPayloadDTO aircraftPayloadDTO)
{
AircraftPayload model = AircraftPayloadServiceConvert.toModel(aircraftPayloadDTO);
AircraftPayload model = AircraftPayloadServiceConvert.to(aircraftPayloadDTO);
List<AircraftPayload> 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<AircraftPayloadDTO> selectAircraftPayloadByAircraftId(Long aircraftId)
{
List<AircraftPayload> modelList = aircraftPayloadDomain.selectAircraftPayloadByAircraftId(aircraftId);
return AircraftPayloadServiceConvert.toDTOList(modelList);
return AircraftPayloadServiceConvert.fromList(modelList);
}
@Override
public List<AircraftPayloadDTO> selectAircraftPayloadByPayloadId(Long payloadId)
{
List<AircraftPayload> modelList = aircraftPayloadDomain.selectAircraftPayloadByPayloadId(payloadId);
return AircraftPayloadServiceConvert.toDTOList(modelList);
return AircraftPayloadServiceConvert.fromList(modelList);
}
@Override
public List<AircraftPayloadDTO> selectAircraftPayloadByDockId(Long dockId)
{
List<AircraftPayload> modelList = aircraftPayloadDomain.selectAircraftPayloadByDockId(dockId);
return AircraftPayloadServiceConvert.toDTOList(modelList);
return AircraftPayloadServiceConvert.fromList(modelList);
}
}

6
src/main/java/com/ruoyi/device/service/impl/AircraftServiceImpl.java
View File

@ -26,16 +26,16 @@ public class AircraftServiceImpl implements IAircraftService
@Override
public List<AircraftDTO> selectAircraftList(AircraftDTO aircraftDTO)
{
Aircraft model = AircraftServiceConvert.toModel(aircraftDTO);
Aircraft model = AircraftServiceConvert.to(aircraftDTO);
List<Aircraft> 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

2
src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java
View File

@ -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();

6
src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
View File

@ -35,16 +35,16 @@ public class DeviceServiceImpl implements IDeviceService {
@Override
public List<DeviceDTO> selectDeviceList(DeviceDTO deviceDTO)
{
Device model = DeviceServiceConvert.toModel(deviceDTO);
Device model = DeviceServiceConvert.to(deviceDTO);
List<Device> 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);
}

6
src/main/java/com/ruoyi/device/service/impl/DeviceTempServiceImpl.java
View File

@ -31,9 +31,9 @@ public class DeviceTempServiceImpl implements IDeviceTempService
@Override
public List<DeviceTempDTO> selectDeviceTempList(DeviceTempDTO deviceTempDTO)
{
DeviceTemp model = DeviceTempServiceConvert.toModel(deviceTempDTO);
DeviceTemp model = DeviceTempServiceConvert.to(deviceTempDTO);
List<DeviceTemp> 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);
}
}

10
src/main/java/com/ruoyi/device/service/impl/DockAircraftServiceImpl.java
View File

@ -25,29 +25,29 @@ public class DockAircraftServiceImpl implements IDockAircraftService
@Override
public List<DockAircraftDTO> selectDockAircraftList(DockAircraftDTO dockAircraftDTO)
{
DockAircraft model = DockAircraftServiceConvert.toModel(dockAircraftDTO);
DockAircraft model = DockAircraftServiceConvert.to(dockAircraftDTO);
List<DockAircraft> 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<DockAircraftDTO> selectDockAircraftByDockId(Long dockId)
{
List<DockAircraft> modelList = dockAircraftDomain.selectDockAircraftByDockId(dockId);
return DockAircraftServiceConvert.toDTOList(modelList);
return DockAircraftServiceConvert.fromList(modelList);
}
@Override
public List<DockAircraftDTO> selectDockAircraftByAircraftId(Long aircraftId)
{
List<DockAircraft> modelList = dockAircraftDomain.selectDockAircraftByAircraftId(aircraftId);
return DockAircraftServiceConvert.toDTOList(modelList);
return DockAircraftServiceConvert.fromList(modelList);
}
}

10
src/main/java/com/ruoyi/device/service/impl/DockGroupServiceImpl.java
View File

@ -25,29 +25,29 @@ public class DockGroupServiceImpl implements IDockGroupService
@Override
public List<DockGroupDTO> selectDockGroupList(DockGroupDTO dockGroupDTO)
{
DockGroup model = DockGroupServiceConvert.toModel(dockGroupDTO);
DockGroup model = DockGroupServiceConvert.to(dockGroupDTO);
List<DockGroup> 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<DockGroupDTO> selectDockGroupByDockId(Long dockId)
{
List<DockGroup> modelList = dockGroupDomain.selectDockGroupByDockId(dockId);
return DockGroupServiceConvert.toDTOList(modelList);
return DockGroupServiceConvert.fromList(modelList);
}
@Override
public List<DockGroupDTO> selectDockGroupByGroupId(Long groupId)
{
List<DockGroup> modelList = dockGroupDomain.selectDockGroupByGroupId(groupId);
return DockGroupServiceConvert.toDTOList(modelList);
return DockGroupServiceConvert.fromList(modelList);
}
}

10
src/main/java/com/ruoyi/device/service/impl/DockServiceImpl.java
View File

@ -25,16 +25,16 @@ public class DockServiceImpl implements IDockService
@Override
public List<DockDTO> selectDockList(DockDTO dockDTO)
{
Dock model = DockServiceConvert.toModel(dockDTO);
Dock model = DockServiceConvert.to(dockDTO);
List<Dock> 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<Dock> modelList = dockDomain.selectDockList(DockServiceConvert.toModel(query));
return DockServiceConvert.toDTOList(modelList);
List<Dock> modelList = dockDomain.selectDockList(DockServiceConvert.to(query));
return DockServiceConvert.fromList(modelList);
}
}

14
src/main/java/com/ruoyi/device/service/impl/GroupServiceImpl.java
View File

@ -48,29 +48,29 @@ public class GroupServiceImpl implements IGroupService
@Override
public List<GroupDTO> selectGroupList(GroupDTO groupDTO)
{
Group model = GroupServiceConvert.toModel(groupDTO);
Group model = GroupServiceConvert.to(groupDTO);
List<Group> 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);
}

6
src/main/java/com/ruoyi/device/service/impl/PayloadServiceImpl.java
View File

@ -25,15 +25,15 @@ public class PayloadServiceImpl implements IPayloadService
@Override
public List<PayloadDTO> selectPayloadList(PayloadDTO payloadDTO)
{
Payload model = PayloadServiceConvert.toModel(payloadDTO);
Payload model = PayloadServiceConvert.to(payloadDTO);
List<Payload> 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);
}
}