From f3137ac76f26e470a84b7fd09b11090424d3475f 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:21:20 +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/DeviceDomainEntityConvert.java | 57 +++++++------------ .../convert/DockGroupDomainEntityConvert.java | 57 +++++++------------ .../convert/GroupDomainEntityConvert.java | 57 +++++++------------ .../device/domain/impl/DeviceDomainImpl.java | 12 ++-- .../domain/impl/DockGroupDomainImpl.java | 14 ++--- .../device/domain/impl/GroupDomainImpl.java | 10 ++-- 6 files changed, 75 insertions(+), 132 deletions(-) diff --git a/src/main/java/com/ruoyi/device/domain/convert/DeviceDomainEntityConvert.java b/src/main/java/com/ruoyi/device/domain/convert/DeviceDomainEntityConvert.java index 4994dd7..b9811ff 100644 --- a/src/main/java/com/ruoyi/device/domain/convert/DeviceDomainEntityConvert.java +++ b/src/main/java/com/ruoyi/device/domain/convert/DeviceDomainEntityConvert.java @@ -1,11 +1,10 @@ package com.ruoyi.device.domain.convert; +import com.ruoyi.common.core.utils.BaseConvert; import com.ruoyi.device.domain.model.Device; import com.ruoyi.device.mapper.entity.DeviceEntity; -import org.springframework.beans.BeanUtils; import java.util.List; -import java.util.stream.Collectors; /** * 设备Domain层转换器 @@ -14,45 +13,27 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-16 */ -public class DeviceDomainEntityConvert -{ - /** - * Entity 转 Model - */ - public static Device toModel(DeviceEntity entity) - { - if (entity == null) - { - return null; - } - Device model = new Device(); - BeanUtils.copyProperties(entity, model); - return model; +public class DeviceDomainEntityConvert extends BaseConvert { + + private static final DeviceDomainEntityConvert INSTANCE = new DeviceDomainEntityConvert(); + + private DeviceDomainEntityConvert() { + super(DeviceEntity.class, Device.class); } - /** - * Model 转 Entity - */ - public static DeviceEntity toEntity(Device model) - { - if (model == null) - { - return null; - } - DeviceEntity entity = new DeviceEntity(); - BeanUtils.copyProperties(model, entity); - return entity; + public static Device from(DeviceEntity entity) { + return INSTANCE.innerFrom(entity); } - /** - * Entity List 转 Model List - */ - public static List toModelList(List entityList) - { - if (entityList == null) - { - return null; - } - return entityList.stream().map(DeviceDomainEntityConvert::toModel).collect(Collectors.toList()); + public static DeviceEntity to(Device 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/DockGroupDomainEntityConvert.java b/src/main/java/com/ruoyi/device/domain/convert/DockGroupDomainEntityConvert.java index 30e67e1..485566d 100644 --- a/src/main/java/com/ruoyi/device/domain/convert/DockGroupDomainEntityConvert.java +++ b/src/main/java/com/ruoyi/device/domain/convert/DockGroupDomainEntityConvert.java @@ -1,11 +1,10 @@ package com.ruoyi.device.domain.convert; +import com.ruoyi.common.core.utils.BaseConvert; import com.ruoyi.device.domain.model.DockGroup; import com.ruoyi.device.mapper.entity.DockGroupEntity; -import org.springframework.beans.BeanUtils; import java.util.List; -import java.util.stream.Collectors; /** * 机场分组关联Domain层转换器 @@ -14,45 +13,27 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-16 */ -public class DockGroupDomainEntityConvert -{ - /** - * Entity 转 Model - */ - public static DockGroup toModel(DockGroupEntity entity) - { - if (entity == null) - { - return null; - } - DockGroup model = new DockGroup(); - BeanUtils.copyProperties(entity, model); - return model; +public class DockGroupDomainEntityConvert extends BaseConvert { + + private static final DockGroupDomainEntityConvert INSTANCE = new DockGroupDomainEntityConvert(); + + private DockGroupDomainEntityConvert() { + super(DockGroupEntity.class, DockGroup.class); } - /** - * Model 转 Entity - */ - public static DockGroupEntity toEntity(DockGroup model) - { - if (model == null) - { - return null; - } - DockGroupEntity entity = new DockGroupEntity(); - BeanUtils.copyProperties(model, entity); - return entity; + public static DockGroup from(DockGroupEntity entity) { + return INSTANCE.innerFrom(entity); } - /** - * Entity List 转 Model List - */ - public static List toModelList(List entityList) - { - if (entityList == null) - { - return null; - } - return entityList.stream().map(DockGroupDomainEntityConvert::toModel).collect(Collectors.toList()); + public static DockGroupEntity to(DockGroup 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/GroupDomainEntityConvert.java b/src/main/java/com/ruoyi/device/domain/convert/GroupDomainEntityConvert.java index d914aaa..3058cf5 100644 --- a/src/main/java/com/ruoyi/device/domain/convert/GroupDomainEntityConvert.java +++ b/src/main/java/com/ruoyi/device/domain/convert/GroupDomainEntityConvert.java @@ -1,11 +1,10 @@ package com.ruoyi.device.domain.convert; +import com.ruoyi.common.core.utils.BaseConvert; import com.ruoyi.device.domain.model.Group; import com.ruoyi.device.mapper.entity.GroupEntity; -import org.springframework.beans.BeanUtils; import java.util.List; -import java.util.stream.Collectors; /** * 分组Domain层转换器 @@ -14,45 +13,27 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-16 */ -public class GroupDomainEntityConvert -{ - /** - * Entity 转 Model - */ - public static Group toModel(GroupEntity entity) - { - if (entity == null) - { - return null; - } - Group model = new Group(); - BeanUtils.copyProperties(entity, model); - return model; +public class GroupDomainEntityConvert extends BaseConvert { + + private static final GroupDomainEntityConvert INSTANCE = new GroupDomainEntityConvert(); + + private GroupDomainEntityConvert() { + super(GroupEntity.class, Group.class); } - /** - * Model 转 Entity - */ - public static GroupEntity toEntity(Group model) - { - if (model == null) - { - return null; - } - GroupEntity entity = new GroupEntity(); - BeanUtils.copyProperties(model, entity); - return entity; + public static Group from(GroupEntity entity) { + return INSTANCE.innerFrom(entity); } - /** - * Entity List 转 Model List - */ - public static List toModelList(List entityList) - { - if (entityList == null) - { - return null; - } - return entityList.stream().map(GroupDomainEntityConvert::toModel).collect(Collectors.toList()); + public static GroupEntity to(Group 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/DeviceDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/DeviceDomainImpl.java index 93ded10..304607a 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/DeviceDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/DeviceDomainImpl.java @@ -28,29 +28,29 @@ public class DeviceDomainImpl implements IDeviceDomain @Override public List selectDeviceList(Device device) { - DeviceEntity entity = DeviceDomainEntityConvert.toEntity(device); + DeviceEntity entity = DeviceDomainEntityConvert.to(device); List entityList = deviceMapper.selectDeviceList(entity); - return DeviceDomainEntityConvert.toModelList(entityList); + return DeviceDomainEntityConvert.fromList(entityList); } @Override public Device selectDeviceByDeviceId(Long deviceId) { DeviceEntity entity = deviceMapper.selectDeviceByDeviceId(deviceId); - return DeviceDomainEntityConvert.toModel(entity); + return DeviceDomainEntityConvert.from(entity); } @Override public Device selectDeviceByIotDeviceId(String iotDeviceId) { DeviceEntity entity = deviceMapper.selectDeviceByIotDeviceId(iotDeviceId); - return DeviceDomainEntityConvert.toModel(entity); + return DeviceDomainEntityConvert.from(entity); } @Override public int insertDevice(Device device) { - DeviceEntity entity = DeviceDomainEntityConvert.toEntity(device); + DeviceEntity entity = DeviceDomainEntityConvert.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.toEntity(device); + DeviceEntity entity = DeviceDomainEntityConvert.to(device); return deviceMapper.updateDevice(entity); } diff --git a/src/main/java/com/ruoyi/device/domain/impl/DockGroupDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/DockGroupDomainImpl.java index 6ed57ac..0325bff 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/DockGroupDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/DockGroupDomainImpl.java @@ -28,36 +28,36 @@ public class DockGroupDomainImpl implements IDockGroupDomain @Override public List selectDockGroupList(DockGroup dockGroup) { - DockGroupEntity entity = DockGroupDomainEntityConvert.toEntity(dockGroup); + DockGroupEntity entity = DockGroupDomainEntityConvert.to(dockGroup); List entityList = dockGroupMapper.selectDockGroupList(entity); - return DockGroupDomainEntityConvert.toModelList(entityList); + return DockGroupDomainEntityConvert.fromList(entityList); } @Override public DockGroup selectDockGroupById(Long id) { DockGroupEntity entity = dockGroupMapper.selectDockGroupById(id); - return DockGroupDomainEntityConvert.toModel(entity); + return DockGroupDomainEntityConvert.from(entity); } @Override public List selectDockGroupByDockId(Long dockId) { List entityList = dockGroupMapper.selectDockGroupListByDockId(dockId); - return DockGroupDomainEntityConvert.toModelList(entityList); + return DockGroupDomainEntityConvert.fromList(entityList); } @Override public List selectDockGroupByGroupId(Long groupId) { List entityList = dockGroupMapper.selectDockGroupListByGroupId(groupId); - return DockGroupDomainEntityConvert.toModelList(entityList); + return DockGroupDomainEntityConvert.fromList(entityList); } @Override public int insertDockGroup(DockGroup dockGroup) { - DockGroupEntity entity = DockGroupDomainEntityConvert.toEntity(dockGroup); + DockGroupEntity entity = DockGroupDomainEntityConvert.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.toEntity(dockGroup); + DockGroupEntity entity = DockGroupDomainEntityConvert.to(dockGroup); return dockGroupMapper.updateDockGroup(entity); } diff --git a/src/main/java/com/ruoyi/device/domain/impl/GroupDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/GroupDomainImpl.java index 8f21473..41ca60a 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/GroupDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/GroupDomainImpl.java @@ -28,22 +28,22 @@ public class GroupDomainImpl implements IGroupDomain @Override public List selectGroupList(Group group) { - GroupEntity entity = GroupDomainEntityConvert.toEntity(group); + GroupEntity entity = GroupDomainEntityConvert.to(group); List entityList = groupMapper.selectGroupList(entity); - return GroupDomainEntityConvert.toModelList(entityList); + return GroupDomainEntityConvert.fromList(entityList); } @Override public Group selectGroupByGroupId(Long groupId) { GroupEntity entity = groupMapper.selectGroupByGroupId(groupId); - return GroupDomainEntityConvert.toModel(entity); + return GroupDomainEntityConvert.from(entity); } @Override public int insertGroup(Group group) { - GroupEntity entity = GroupDomainEntityConvert.toEntity(group); + GroupEntity entity = GroupDomainEntityConvert.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.toEntity(group); + GroupEntity entity = GroupDomainEntityConvert.to(group); return groupMapper.updateGroup(entity); }