From 49fb0f24715bb65496686aa70d5fbc6ce4a3eb7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Wed, 21 Jan 2026 10:32:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9convert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../convert/AircraftDomainEntityConvert.java | 59 ++++++++----------- .../AircraftPayloadDomainEntityConvert.java | 58 +++++++----------- .../domain/impl/AircraftDomainImpl.java | 12 ++-- .../impl/AircraftPayloadDomainImpl.java | 16 ++--- 4 files changed, 59 insertions(+), 86 deletions(-) diff --git a/src/main/java/com/ruoyi/device/domain/convert/AircraftDomainEntityConvert.java b/src/main/java/com/ruoyi/device/domain/convert/AircraftDomainEntityConvert.java index f5207b1..03336c0 100644 --- a/src/main/java/com/ruoyi/device/domain/convert/AircraftDomainEntityConvert.java +++ b/src/main/java/com/ruoyi/device/domain/convert/AircraftDomainEntityConvert.java @@ -1,7 +1,12 @@ 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; @@ -14,45 +19,27 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-16 */ -public class AircraftDomainEntityConvert -{ - /** - * Entity 转 Model - */ - public static Aircraft toModel(AircraftEntity entity) - { - if (entity == null) - { - return null; - } - Aircraft model = new Aircraft(); - BeanUtils.copyProperties(entity, model); - return model; +public class AircraftDomainEntityConvert extends BaseConvert { + + private static final AircraftDomainEntityConvert INSTANCE = new AircraftDomainEntityConvert(); + + private AircraftDomainEntityConvert() { + super(AircraftEntity.class, Aircraft.class); } - /** - * Model 转 Entity - */ - public static AircraftEntity toEntity(Aircraft model) - { - if (model == null) - { - return null; - } - AircraftEntity entity = new AircraftEntity(); - BeanUtils.copyProperties(model, entity); - return entity; + public static Aircraft from(AircraftEntity entity) { + return INSTANCE.innerFrom(entity); } - /** - * Entity List 转 Model List - */ - public static List toModelList(List entityList) - { - if (entityList == null) - { - return null; - } - return entityList.stream().map(AircraftDomainEntityConvert::toModel).collect(Collectors.toList()); + public static AircraftEntity to(Aircraft model) { + return INSTANCE.innerTo(model); + } + + public static List fromList(List entityList) { + return INSTANCE.innerFromList(entityList); + } + + public static List toList(List modelList) { + return INSTANCE.innerToList(modelList); } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadDomainEntityConvert.java b/src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadDomainEntityConvert.java index f63c396..6ac20f6 100644 --- a/src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadDomainEntityConvert.java +++ b/src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadDomainEntityConvert.java @@ -1,6 +1,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.AircraftPayload; +import com.ruoyi.device.mapper.entity.AircraftEntity; import com.ruoyi.device.mapper.entity.AircraftPayloadEntity; import org.springframework.beans.BeanUtils; @@ -14,45 +17,28 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-16 */ -public class AircraftPayloadDomainEntityConvert -{ - /** - * Entity 转 Model - */ - public static AircraftPayload toModel(AircraftPayloadEntity entity) - { - if (entity == null) - { - return null; - } - AircraftPayload model = new AircraftPayload(); - BeanUtils.copyProperties(entity, model); - return model; +public class AircraftPayloadDomainEntityConvert extends BaseConvert { + + private static final AircraftPayloadDomainEntityConvert INSTANCE = new AircraftPayloadDomainEntityConvert(); + + private AircraftPayloadDomainEntityConvert() { + super(AircraftPayloadEntity.class, AircraftPayload.class); } - /** - * Model 转 Entity - */ - public static AircraftPayloadEntity toEntity(AircraftPayload model) - { - if (model == null) - { - return null; - } - AircraftPayloadEntity entity = new AircraftPayloadEntity(); - BeanUtils.copyProperties(model, entity); - return entity; + public static AircraftPayload from(AircraftPayloadEntity entity) { + return INSTANCE.innerFrom(entity); } - /** - * Entity List 转 Model List - */ - public static List toModelList(List entityList) - { - if (entityList == null) - { - return null; - } - return entityList.stream().map(AircraftPayloadDomainEntityConvert::toModel).collect(Collectors.toList()); + public static AircraftPayloadEntity to(AircraftPayload model) { + return INSTANCE.innerTo(model); } + + public static List fromList(List entityList) { + return INSTANCE.innerFromList(entityList); + } + + public static List toList(List modelList) { + return INSTANCE.innerToList(modelList); + } + } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/domain/impl/AircraftDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/AircraftDomainImpl.java index 6a05fdc..07536bc 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/AircraftDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/AircraftDomainImpl.java @@ -28,29 +28,29 @@ public class AircraftDomainImpl implements IAircraftDomain @Override public List selectAircraftList(Aircraft aircraft) { - AircraftEntity entity = AircraftDomainEntityConvert.toEntity(aircraft); + AircraftEntity entity = AircraftDomainEntityConvert.to(aircraft); List entityList = aircraftMapper.selectAircraftList(entity); - return AircraftDomainEntityConvert.toModelList(entityList); + return AircraftDomainEntityConvert.fromList(entityList); } @Override public Aircraft selectAircraftByAircraftId(Long aircraftId) { AircraftEntity entity = aircraftMapper.selectAircraftByAircraftId(aircraftId); - return AircraftDomainEntityConvert.toModel(entity); + return AircraftDomainEntityConvert.from(entity); } @Override public Aircraft selectAircraftByDeviceId(Long deviceId) { AircraftEntity entity = aircraftMapper.selectAircraftByDeviceId(deviceId); - return AircraftDomainEntityConvert.toModel(entity); + return AircraftDomainEntityConvert.from(entity); } @Override public int insertAircraft(Aircraft aircraft) { - AircraftEntity entity = AircraftDomainEntityConvert.toEntity(aircraft); + AircraftEntity entity = AircraftDomainEntityConvert.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.toEntity(aircraft); + AircraftEntity entity = AircraftDomainEntityConvert.to(aircraft); return aircraftMapper.updateAircraft(entity); } diff --git a/src/main/java/com/ruoyi/device/domain/impl/AircraftPayloadDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/AircraftPayloadDomainImpl.java index a2cbb56..1ff3fec 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/AircraftPayloadDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/AircraftPayloadDomainImpl.java @@ -28,43 +28,43 @@ public class AircraftPayloadDomainImpl implements IAircraftPayloadDomain @Override public List selectAircraftPayloadList(AircraftPayload aircraftPayload) { - AircraftPayloadEntity entity = AircraftPayloadDomainEntityConvert.toEntity(aircraftPayload); + AircraftPayloadEntity entity = AircraftPayloadDomainEntityConvert.to(aircraftPayload); List entityList = aircraftPayloadMapper.selectAircraftPayloadList(entity); - return AircraftPayloadDomainEntityConvert.toModelList(entityList); + return AircraftPayloadDomainEntityConvert.fromList(entityList); } @Override public AircraftPayload selectAircraftPayloadById(Long id) { AircraftPayloadEntity entity = aircraftPayloadMapper.selectAircraftPayloadById(id); - return AircraftPayloadDomainEntityConvert.toModel(entity); + return AircraftPayloadDomainEntityConvert.from(entity); } @Override public List selectAircraftPayloadByAircraftId(Long aircraftId) { List entityList = aircraftPayloadMapper.selectAircraftPayloadListByAircraftId(aircraftId); - return AircraftPayloadDomainEntityConvert.toModelList(entityList); + return AircraftPayloadDomainEntityConvert.fromList(entityList); } @Override public List selectAircraftPayloadByPayloadId(Long payloadId) { List entityList = aircraftPayloadMapper.selectAircraftPayloadListByPayloadId(payloadId); - return AircraftPayloadDomainEntityConvert.toModelList(entityList); + return AircraftPayloadDomainEntityConvert.fromList(entityList); } @Override public List selectAircraftPayloadByDockId(Long dockId) { List entityList = aircraftPayloadMapper.selectAircraftPayloadListByDockId(dockId); - return AircraftPayloadDomainEntityConvert.toModelList(entityList); + return AircraftPayloadDomainEntityConvert.fromList(entityList); } @Override public int insertAircraftPayload(AircraftPayload aircraftPayload) { - AircraftPayloadEntity entity = AircraftPayloadDomainEntityConvert.toEntity(aircraftPayload); + AircraftPayloadEntity entity = AircraftPayloadDomainEntityConvert.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.toEntity(aircraftPayload); + AircraftPayloadEntity entity = AircraftPayloadDomainEntityConvert.to(aircraftPayload); return aircraftPayloadMapper.updateAircraftPayload(entity); }