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 13:18:33 +08:00
parent 518a2bff17
commit f4f5db269a
49 changed files with 312 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<AircraftDetailVO> getAircraftDetail(@PathVariable("aircraftId") Long aircraftId)
{
AircraftDetailDTO dto = bufferDeviceService.getAircraftDetailById(aircraftId);
AircraftDetailVO vo = AircraftDetailDTOConvert.from(dto);
AircraftDetailVO vo = AircraftDetailVOConvert.from(dto);
return R.ok(vo);
}
}

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

@ -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<DeviceTempDTO> dtoList = deviceTempService.selectDeviceTempList(dto);
// Service DTO → API Domain
List<DeviceTempVO> list = DeviceTempControllerConvert.fromList(dtoList);
List<DeviceTempVO> list = DeviceTempVOConvert.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.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);
}
}

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

@ -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<List<DockVO>> searchDocks(@RequestParam(required = false) String dockStatus, @RequestParam(required = false) Long dockId)
{
List<DockDTO> dtoList = dockService.searchDocks(dockStatus, dockId);
List<DockVO> voList = DockControllerConvert.fromList(dtoList);
List<DockVO> voList = DockVOConvert.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.from(dto);
DockDetailVO vo = DockDetailVOConvert.from(dto);
return R.ok(vo);
}
}

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

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

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

@ -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<AircraftDetailDTO, AircraftDetailVO>
{
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<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);
}
}

39
src/main/java/com/ruoyi/device/controller/convert/AircraftDetailVOConvert.java Normal file
View File

@ -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<AircraftDetailDTO, AircraftDetailVO>
{
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<AircraftDetailVO> fromList(List<AircraftDetailDTO> dtoList)
{
return INSTANCE.innerFromList(dtoList);
}
public static List<AircraftDetailDTO> toList(List<AircraftDetailVO> voList)
{
return INSTANCE.innerToList(voList);
}
}

6
src/main/java/com/ruoyi/device/controller/convert/DeviceTempControllerConvert.java → src/main/java/com/ruoyi/device/controller/convert/DeviceTempVOConvert.java
View File

@ -13,12 +13,12 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-15
*/
public class DeviceTempControllerConvert extends BaseConvert<DeviceTempDTO, DeviceTempVO>
public class DeviceTempVOConvert extends BaseConvert<DeviceTempDTO, DeviceTempVO>
{
private static final DeviceTempControllerConvert INSTANCE = new DeviceTempControllerConvert();
private static final DeviceTempVOConvert INSTANCE = new DeviceTempVOConvert();
private DeviceTempControllerConvert() {
private DeviceTempVOConvert() {
super(DeviceTempDTO.class, DeviceTempVO.class);
}

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

@ -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<DockDTO, DockVO>
{
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<DockVO> fromList(List<DockDTO> dtoList)
{
return INSTANCE.innerFromList(dtoList);
}
/**
* VO List 转 DTO List
*/
public static List<DockDTO> toList(List<DockVO> voList)
{
return INSTANCE.innerToList(voList);
}
}

8
src/main/java/com/ruoyi/device/controller/convert/DockDetailDTOConvert.java → src/main/java/com/ruoyi/device/controller/convert/DockDetailVOConvert.java
View File

@ -14,12 +14,12 @@ import java.util.stream.Collectors;
* @author ruoyi
* @date 2026-01-20
*/
public class DockDetailDTOConvert extends BaseConvert<DockDetailDTO, DockDetailVO>
public class DockDetailVOConvert extends BaseConvert<DockDetailDTO, DockDetailVO>
{
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<DockDetailDTO, DockDetailV
{
return null;
}
return dtoList.stream().map(DockDetailDTOConvert::from).collect(Collectors.toList());
return dtoList.stream().map(DockDetailVOConvert::from).collect(Collectors.toList());
}
public static List<DockDetailDTO> toList(List<DockDetailVO> voList)

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

@ -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<DockDetailDTO, DockVO>
{
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<DockVO> fromList(List<DockDetailDTO> dtoList)
{
return INSTANCE.innerFromList(dtoList);
}
/**
* API Domain List 转 DTO List
*/
public static List<DockDetailDTO> toList(List<DockVO> voList)
{
return INSTANCE.innerToList(voList);
}
}

80
src/main/java/com/ruoyi/device/controller/convert/DockVOConvert.java Normal file
View File

@ -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<DockDTO, DockVO>
{
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<DockVO> fromList(List<DockDTO> dtoList)
{
return INSTANCE.innerFromList(dtoList);
}
/**
* DTO List 转 VO List
*/
public static List<DockVO> fromDockDetailDTOList(List<DockDetailDTO> 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<DockDTO> toList(List<DockVO> voList)
{
return INSTANCE.innerToList(voList);
}
}

6
src/main/java/com/ruoyi/device/controller/convert/GroupControllerConvert.java → src/main/java/com/ruoyi/device/controller/convert/GroupVOConvert.java
View File

@ -12,12 +12,12 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-20
*/
public class GroupControllerConvert extends BaseConvert<GroupDTO, GroupVO>
public class GroupVOConvert extends BaseConvert<GroupDTO, GroupVO>
{
private static final GroupControllerConvert INSTANCE = new GroupControllerConvert();
private static final GroupVOConvert INSTANCE = new GroupVOConvert();
private GroupControllerConvert() {
private GroupVOConvert() {
super(GroupDTO.class, GroupVO.class);
}

23
src/main/java/com/ruoyi/device/controller/convert/NetworkControllerConvert.java → src/main/java/com/ruoyi/device/controller/convert/NetworkVOConvert.java
View File

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

6
src/main/java/com/ruoyi/device/controller/convert/PlayloadControllerConvert.java → src/main/java/com/ruoyi/device/controller/convert/PayloadDetailVOConvert.java
View File

@ -6,12 +6,12 @@ import com.ruoyi.device.service.dto.PayloadDTO;
import java.util.List;
public class PlayloadControllerConvert extends BaseConvert<PayloadDTO, PayloadDetailVO>
public class PayloadDetailVOConvert extends BaseConvert<PayloadDTO, PayloadDetailVO>
{
private static final PlayloadControllerConvert INSTANCE = new PlayloadControllerConvert();
private static final PayloadDetailVOConvert INSTANCE = new PayloadDetailVOConvert();
private PlayloadControllerConvert() {
private PayloadDetailVOConvert() {
super(PayloadDTO.class, PayloadDetailVO.class);
}

12
src/main/java/com/ruoyi/device/domain/convert/AircraftDomainEntityConvert.java → src/main/java/com/ruoyi/device/domain/convert/AircraftConvert.java
View File

@ -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<AircraftEntity, Aircraft> {
public class AircraftConvert extends BaseConvert<AircraftEntity, Aircraft> {
private static final AircraftDomainEntityConvert INSTANCE = new AircraftDomainEntityConvert();
private static final AircraftConvert INSTANCE = new AircraftConvert();
private AircraftDomainEntityConvert() {
private AircraftConvert() {
super(AircraftEntity.class, Aircraft.class);
}

10
src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadDomainEntityConvert.java → src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadConvert.java
View File

@ -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<AircraftPayloadEntity, AircraftPayload> {
public class AircraftPayloadConvert extends BaseConvert<AircraftPayloadEntity, AircraftPayload> {
private static final AircraftPayloadDomainEntityConvert INSTANCE = new AircraftPayloadDomainEntityConvert();
private static final AircraftPayloadConvert INSTANCE = new AircraftPayloadConvert();
private AircraftPayloadDomainEntityConvert() {
private AircraftPayloadConvert() {
super(AircraftPayloadEntity.class, AircraftPayload.class);
}

6
src/main/java/com/ruoyi/device/domain/convert/DeviceDomainEntityConvert.java → src/main/java/com/ruoyi/device/domain/convert/DeviceConvert.java
View File

@ -13,11 +13,11 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-16
*/
public class DeviceDomainEntityConvert extends BaseConvert<DeviceEntity, Device> {
public class DeviceConvert extends BaseConvert<DeviceEntity, Device> {
private static final DeviceDomainEntityConvert INSTANCE = new DeviceDomainEntityConvert();
private static final DeviceConvert INSTANCE = new DeviceConvert();
private DeviceDomainEntityConvert() {
private DeviceConvert() {
super(DeviceEntity.class, Device.class);
}

10
src/main/java/com/ruoyi/device/domain/convert/DockAircraftDomainEntityConvert.java → src/main/java/com/ruoyi/device/domain/convert/DockAircraftConvert.java
View File

@ -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<DockAircraftEntity, DockAircraft>
public class DockAircraftConvert extends BaseConvert<DockAircraftEntity, DockAircraft>
{
private static final DockAircraftDomainEntityConvert INSTANCE = new DockAircraftDomainEntityConvert();
private static final DockAircraftConvert INSTANCE = new DockAircraftConvert();
private DockAircraftDomainEntityConvert() {
private DockAircraftConvert() {
super(DockAircraftEntity.class, DockAircraft.class);
}

10
src/main/java/com/ruoyi/device/domain/convert/DockDomainEntityConvert.java → src/main/java/com/ruoyi/device/domain/convert/DockConvert.java
View File

@ -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<DockEntity, Dock>
public class DockConvert extends BaseConvert<DockEntity, Dock>
{
private static final DockDomainEntityConvert INSTANCE = new DockDomainEntityConvert();
private static final DockConvert INSTANCE = new DockConvert();
private DockDomainEntityConvert() {
private DockConvert() {
super(DockEntity.class, Dock.class);
}

6
src/main/java/com/ruoyi/device/domain/convert/DockGroupDomainEntityConvert.java → src/main/java/com/ruoyi/device/domain/convert/DockGroupConvert.java
View File

@ -13,11 +13,11 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-16
*/
public class DockGroupDomainEntityConvert extends BaseConvert<DockGroupEntity, DockGroup> {
public class DockGroupConvert extends BaseConvert<DockGroupEntity, DockGroup> {
private static final DockGroupDomainEntityConvert INSTANCE = new DockGroupDomainEntityConvert();
private static final DockGroupConvert INSTANCE = new DockGroupConvert();
private DockGroupDomainEntityConvert() {
private DockGroupConvert() {
super(DockGroupEntity.class, DockGroup.class);
}

6
src/main/java/com/ruoyi/device/domain/convert/GroupDomainEntityConvert.java → src/main/java/com/ruoyi/device/domain/convert/GroupConvert.java
View File

@ -13,11 +13,11 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-16
*/
public class GroupDomainEntityConvert extends BaseConvert<GroupEntity, Group> {
public class GroupConvert extends BaseConvert<GroupEntity, Group> {
private static final GroupDomainEntityConvert INSTANCE = new GroupDomainEntityConvert();
private static final GroupConvert INSTANCE = new GroupConvert();
private GroupDomainEntityConvert() {
private GroupConvert() {
super(GroupEntity.class, Group.class);
}

12
src/main/java/com/ruoyi/device/domain/convert/PayloadDomainEntityConvert.java → src/main/java/com/ruoyi/device/domain/convert/PayloadConvert.java
View File

@ -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<PayloadEntity, Payload>
public class PayloadConvert extends BaseConvert<PayloadEntity, Payload>
{
private static final PayloadDomainEntityConvert INSTANCE = new PayloadDomainEntityConvert();
private static final PayloadConvert INSTANCE = new PayloadConvert();
private PayloadDomainEntityConvert() {
private PayloadConvert() {
super(PayloadEntity.class, Payload.class);
}

14
src/main/java/com/ruoyi/device/domain/impl/AircraftDomainImpl.java
View File

@ -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<Aircraft> selectAircraftList(Aircraft aircraft)
{
AircraftEntity entity = AircraftDomainEntityConvert.to(aircraft);
AircraftEntity entity = AircraftConvert.to(aircraft);
List<AircraftEntity> 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);
}

18
src/main/java/com/ruoyi/device/domain/impl/AircraftPayloadDomainImpl.java
View File

@ -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<AircraftPayload> selectAircraftPayloadList(AircraftPayload aircraftPayload)
{
AircraftPayloadEntity entity = AircraftPayloadDomainEntityConvert.to(aircraftPayload);
AircraftPayloadEntity entity = AircraftPayloadConvert.to(aircraftPayload);
List<AircraftPayloadEntity> 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<AircraftPayload> selectAircraftPayloadByAircraftId(Long aircraftId)
{
List<AircraftPayloadEntity> entityList = aircraftPayloadMapper.selectAircraftPayloadListByAircraftId(aircraftId);
return AircraftPayloadDomainEntityConvert.fromList(entityList);
return AircraftPayloadConvert.fromList(entityList);
}
@Override
public List<AircraftPayload> selectAircraftPayloadByPayloadId(Long payloadId)
{
List<AircraftPayloadEntity> entityList = aircraftPayloadMapper.selectAircraftPayloadListByPayloadId(payloadId);
return AircraftPayloadDomainEntityConvert.fromList(entityList);
return AircraftPayloadConvert.fromList(entityList);
}
@Override
public List<AircraftPayload> selectAircraftPayloadByDockId(Long dockId)
{
List<AircraftPayloadEntity> 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);
}

14
src/main/java/com/ruoyi/device/domain/impl/DeviceDomainImpl.java
View File

@ -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<Device> selectDeviceList(Device device)
{
DeviceEntity entity = DeviceDomainEntityConvert.to(device);
DeviceEntity entity = DeviceConvert.to(device);
List<DeviceEntity> 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);
}

16
src/main/java/com/ruoyi/device/domain/impl/DockAircraftDomainImpl.java
View File

@ -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<DockAircraft> selectDockAircraftList(DockAircraft dockAircraft)
{
DockAircraftEntity entity = DockAircraftDomainEntityConvert.to(dockAircraft);
DockAircraftEntity entity = DockAircraftConvert.to(dockAircraft);
List<DockAircraftEntity> 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<DockAircraft> selectDockAircraftByDockId(Long dockId)
{
List<DockAircraftEntity> entityList = dockAircraftMapper.selectDockAircraftListByDockId(dockId);
return DockAircraftDomainEntityConvert.fromList(entityList);
return DockAircraftConvert.fromList(entityList);
}
@Override
public List<DockAircraft> selectDockAircraftByAircraftId(Long aircraftId)
{
List<DockAircraftEntity> 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);
}

14
src/main/java/com/ruoyi/device/domain/impl/DockDomainImpl.java
View File

@ -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<Dock> selectDockList(Dock dock)
{
DockEntity entity = DockDomainEntityConvert.to(dock);
DockEntity entity = DockConvert.to(dock);
List<DockEntity> 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);
}

16
src/main/java/com/ruoyi/device/domain/impl/DockGroupDomainImpl.java
View File

@ -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<DockGroup> selectDockGroupList(DockGroup dockGroup)
{
DockGroupEntity entity = DockGroupDomainEntityConvert.to(dockGroup);
DockGroupEntity entity = DockGroupConvert.to(dockGroup);
List<DockGroupEntity> 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<DockGroup> selectDockGroupByDockId(Long dockId)
{
List<DockGroupEntity> entityList = dockGroupMapper.selectDockGroupListByDockId(dockId);
return DockGroupDomainEntityConvert.fromList(entityList);
return DockGroupConvert.fromList(entityList);
}
@Override
public List<DockGroup> selectDockGroupByGroupId(Long groupId)
{
List<DockGroupEntity> 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);
}

12
src/main/java/com/ruoyi/device/domain/impl/GroupDomainImpl.java
View File

@ -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<Group> selectGroupList(Group group)
{
GroupEntity entity = GroupDomainEntityConvert.to(group);
GroupEntity entity = GroupConvert.to(group);
List<GroupEntity> 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);
}

12
src/main/java/com/ruoyi/device/domain/impl/PayloadDomainImpl.java
View File

@ -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<Payload> selectPayloadList(Payload payload)
{
PayloadEntity entity = PayloadDomainEntityConvert.to(payload);
PayloadEntity entity = PayloadConvert.to(payload);
List<PayloadEntity> 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);
}

6
src/main/java/com/ruoyi/device/service/convert/AircraftServiceConvert.java → src/main/java/com/ruoyi/device/service/convert/AircraftDTOConvert.java
View File

@ -13,12 +13,12 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-16
*/
public class AircraftServiceConvert extends BaseConvert<Aircraft, AircraftDTO>
public class AircraftDTOConvert extends BaseConvert<Aircraft, AircraftDTO>
{
private static final AircraftServiceConvert INSTANCE = new AircraftServiceConvert();
private static final AircraftDTOConvert INSTANCE = new AircraftDTOConvert();
private AircraftServiceConvert() {
private AircraftDTOConvert() {
super(Aircraft.class, AircraftDTO.class);
}

6
src/main/java/com/ruoyi/device/service/convert/AircraftPayloadServiceConvert.java → src/main/java/com/ruoyi/device/service/convert/AircraftPayloadDTOConvert.java
View File

@ -13,12 +13,12 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-16
*/
public class AircraftPayloadServiceConvert extends BaseConvert<AircraftPayload, AircraftPayloadDTO>
public class AircraftPayloadDTOConvert extends BaseConvert<AircraftPayload, AircraftPayloadDTO>
{
private static final AircraftPayloadServiceConvert INSTANCE = new AircraftPayloadServiceConvert();
private static final AircraftPayloadDTOConvert INSTANCE = new AircraftPayloadDTOConvert();
private AircraftPayloadServiceConvert() {
private AircraftPayloadDTOConvert() {
super(AircraftPayload.class, AircraftPayloadDTO.class);
}

6
src/main/java/com/ruoyi/device/service/convert/DeviceServiceConvert.java → src/main/java/com/ruoyi/device/service/convert/DeviceDTOConvert.java
View File

@ -13,12 +13,12 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-16
*/
public class DeviceServiceConvert extends BaseConvert<Device, DeviceDTO>
public class DeviceDTOConvert extends BaseConvert<Device, DeviceDTO>
{
private static final DeviceServiceConvert INSTANCE = new DeviceServiceConvert();
private static final DeviceDTOConvert INSTANCE = new DeviceDTOConvert();
private DeviceServiceConvert() {
private DeviceDTOConvert() {
super(Device.class, DeviceDTO.class);
}

6
src/main/java/com/ruoyi/device/service/convert/DeviceTempServiceConvert.java → src/main/java/com/ruoyi/device/service/convert/DeviceTempDTOConvert.java
View File

@ -13,12 +13,12 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-15
*/
public class DeviceTempServiceConvert extends BaseConvert<DeviceTemp, DeviceTempDTO>
public class DeviceTempDTOConvert extends BaseConvert<DeviceTemp, DeviceTempDTO>
{
private static final DeviceTempServiceConvert INSTANCE = new DeviceTempServiceConvert();
private static final DeviceTempDTOConvert INSTANCE = new DeviceTempDTOConvert();
private DeviceTempServiceConvert() {
private DeviceTempDTOConvert() {
super(DeviceTemp.class, DeviceTempDTO.class);
}

6
src/main/java/com/ruoyi/device/service/convert/DockAircraftServiceConvert.java → src/main/java/com/ruoyi/device/service/convert/DockAircraftDTOConvert.java
View File

@ -13,12 +13,12 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-16
*/
public class DockAircraftServiceConvert extends BaseConvert<DockAircraft, DockAircraftDTO>
public class DockAircraftDTOConvert extends BaseConvert<DockAircraft, DockAircraftDTO>
{
private static final DockAircraftServiceConvert INSTANCE = new DockAircraftServiceConvert();
private static final DockAircraftDTOConvert INSTANCE = new DockAircraftDTOConvert();
private DockAircraftServiceConvert() {
private DockAircraftDTOConvert() {
super(DockAircraft.class, DockAircraftDTO.class);
}

6
src/main/java/com/ruoyi/device/service/convert/DockServiceConvert.java → src/main/java/com/ruoyi/device/service/convert/DockDTOConvert.java
View File

@ -13,12 +13,12 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-16
*/
public class DockServiceConvert extends BaseConvert<Dock, DockDTO>
public class DockDTOConvert extends BaseConvert<Dock, DockDTO>
{
private static final DockServiceConvert INSTANCE = new DockServiceConvert();
private static final DockDTOConvert INSTANCE = new DockDTOConvert();
private DockServiceConvert() {
private DockDTOConvert() {
super(Dock.class, DockDTO.class);
}

6
src/main/java/com/ruoyi/device/service/convert/DockGroupServiceConvert.java → src/main/java/com/ruoyi/device/service/convert/DockGroupDTOConvert.java
View File

@ -13,12 +13,12 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-16
*/
public class DockGroupServiceConvert extends BaseConvert<DockGroup, DockGroupDTO>
public class DockGroupDTOConvert extends BaseConvert<DockGroup, DockGroupDTO>
{
private static final DockGroupServiceConvert INSTANCE = new DockGroupServiceConvert();
private static final DockGroupDTOConvert INSTANCE = new DockGroupDTOConvert();
private DockGroupServiceConvert() {
private DockGroupDTOConvert() {
super(DockGroup.class, DockGroupDTO.class);
}

6
src/main/java/com/ruoyi/device/service/convert/GroupServiceConvert.java → src/main/java/com/ruoyi/device/service/convert/GroupDTOConvert.java
View File

@ -13,12 +13,12 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-16
*/
public class GroupServiceConvert extends BaseConvert<Group, GroupDTO>
public class GroupDTOConvert extends BaseConvert<Group, GroupDTO>
{
private static final GroupServiceConvert INSTANCE = new GroupServiceConvert();
private static final GroupDTOConvert INSTANCE = new GroupDTOConvert();
private GroupServiceConvert() {
private GroupDTOConvert() {
super(Group.class, GroupDTO.class);
}

6
src/main/java/com/ruoyi/device/service/convert/PayloadServiceConvert.java → src/main/java/com/ruoyi/device/service/convert/PayloadDTOConvert.java
View File

@ -13,12 +13,12 @@ import java.util.List;
* @author ruoyi
* @date 2026-01-16
*/
public class PayloadServiceConvert extends BaseConvert<Payload, PayloadDTO>
public class PayloadDTOConvert extends BaseConvert<Payload, PayloadDTO>
{
private static final PayloadServiceConvert INSTANCE = new PayloadServiceConvert();
private static final PayloadDTOConvert INSTANCE = new PayloadDTOConvert();
private PayloadServiceConvert() {
private PayloadDTOConvert() {
super(Payload.class, PayloadDTO.class);
}

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

@ -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<AircraftPayloadDTO> selectAircraftPayloadList(AircraftPayloadDTO aircraftPayloadDTO)
{
AircraftPayload model = AircraftPayloadServiceConvert.to(aircraftPayloadDTO);
AircraftPayload model = AircraftPayloadDTOConvert.to(aircraftPayloadDTO);
List<AircraftPayload> 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<AircraftPayloadDTO> selectAircraftPayloadByAircraftId(Long aircraftId)
{
List<AircraftPayload> modelList = aircraftPayloadDomain.selectAircraftPayloadByAircraftId(aircraftId);
return AircraftPayloadServiceConvert.fromList(modelList);
return AircraftPayloadDTOConvert.fromList(modelList);
}
@Override
public List<AircraftPayloadDTO> selectAircraftPayloadByPayloadId(Long payloadId)
{
List<AircraftPayload> modelList = aircraftPayloadDomain.selectAircraftPayloadByPayloadId(payloadId);
return AircraftPayloadServiceConvert.fromList(modelList);
return AircraftPayloadDTOConvert.fromList(modelList);
}
@Override
public List<AircraftPayloadDTO> selectAircraftPayloadByDockId(Long dockId)
{
List<AircraftPayload> modelList = aircraftPayloadDomain.selectAircraftPayloadByDockId(dockId);
return AircraftPayloadServiceConvert.fromList(modelList);
return AircraftPayloadDTOConvert.fromList(modelList);
}
}

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

@ -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<AircraftDTO> selectAircraftList(AircraftDTO aircraftDTO)
{
Aircraft model = AircraftServiceConvert.to(aircraftDTO);
Aircraft model = AircraftDTOConvert.to(aircraftDTO);
List<Aircraft> 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

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

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

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

@ -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<DeviceDTO> selectDeviceList(DeviceDTO deviceDTO)
{
Device model = DeviceServiceConvert.to(deviceDTO);
Device model = DeviceDTOConvert.to(deviceDTO);
List<Device> 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);
}

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

@ -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<DeviceTempDTO> selectDeviceTempList(DeviceTempDTO deviceTempDTO)
{
DeviceTemp model = DeviceTempServiceConvert.to(deviceTempDTO);
DeviceTemp model = DeviceTempDTOConvert.to(deviceTempDTO);
List<DeviceTemp> 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);
}
}

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

@ -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<DockAircraftDTO> selectDockAircraftList(DockAircraftDTO dockAircraftDTO)
{
DockAircraft model = DockAircraftServiceConvert.to(dockAircraftDTO);
DockAircraft model = DockAircraftDTOConvert.to(dockAircraftDTO);
List<DockAircraft> 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<DockAircraftDTO> selectDockAircraftByDockId(Long dockId)
{
List<DockAircraft> modelList = dockAircraftDomain.selectDockAircraftByDockId(dockId);
return DockAircraftServiceConvert.fromList(modelList);
return DockAircraftDTOConvert.fromList(modelList);
}
@Override
public List<DockAircraftDTO> selectDockAircraftByAircraftId(Long aircraftId)
{
List<DockAircraft> modelList = dockAircraftDomain.selectDockAircraftByAircraftId(aircraftId);
return DockAircraftServiceConvert.fromList(modelList);
return DockAircraftDTOConvert.fromList(modelList);
}
}

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

@ -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<DockGroupDTO> selectDockGroupList(DockGroupDTO dockGroupDTO)
{
DockGroup model = DockGroupServiceConvert.to(dockGroupDTO);
DockGroup model = DockGroupDTOConvert.to(dockGroupDTO);
List<DockGroup> 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<DockGroupDTO> selectDockGroupByDockId(Long dockId)
{
List<DockGroup> modelList = dockGroupDomain.selectDockGroupByDockId(dockId);
return DockGroupServiceConvert.fromList(modelList);
return DockGroupDTOConvert.fromList(modelList);
}
@Override
public List<DockGroupDTO> selectDockGroupByGroupId(Long groupId)
{
List<DockGroup> modelList = dockGroupDomain.selectDockGroupByGroupId(groupId);
return DockGroupServiceConvert.fromList(modelList);
return DockGroupDTOConvert.fromList(modelList);
}
}

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

@ -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<DockDTO> selectDockList(DockDTO dockDTO)
{
Dock model = DockServiceConvert.to(dockDTO);
Dock model = DockDTOConvert.to(dockDTO);
List<Dock> 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<Dock> modelList = dockDomain.selectDockList(DockServiceConvert.to(query));
return DockServiceConvert.fromList(modelList);
List<Dock> modelList = dockDomain.selectDockList(DockDTOConvert.to(query));
return DockDTOConvert.fromList(modelList);
}
}

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

@ -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<GroupDTO> selectGroupList(GroupDTO groupDTO)
{
Group model = GroupServiceConvert.to(groupDTO);
Group model = GroupDTOConvert.to(groupDTO);
List<Group> 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);
}

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

@ -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<PayloadDTO> selectPayloadList(PayloadDTO payloadDTO)
{
Payload model = PayloadServiceConvert.to(payloadDTO);
Payload model = PayloadDTOConvert.to(payloadDTO);
List<Payload> 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);
}
}