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 10:32:13 +08:00
parent f3137ac76f
commit 49fb0f2471
4 changed files with 59 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/main/java/com/ruoyi/device/domain/convert/AircraftDomainEntityConvert.java
View File

@ -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<AircraftEntity, Aircraft> {
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<Aircraft> toModelList(List<AircraftEntity> entityList)
{
if (entityList == null)
{
return null;
public static AircraftEntity to(Aircraft model) {
return INSTANCE.innerTo(model);
}
return entityList.stream().map(AircraftDomainEntityConvert::toModel).collect(Collectors.toList());
public static List<Aircraft> fromList(List<AircraftEntity> entityList) {
return INSTANCE.innerFromList(entityList);
}
public static List<AircraftEntity> toList(List<Aircraft> modelList) {
return INSTANCE.innerToList(modelList);
}
}

56
src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadDomainEntityConvert.java
View File

@ -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<AircraftPayloadEntity, AircraftPayload> {
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<AircraftPayload> toModelList(List<AircraftPayloadEntity> entityList)
{
if (entityList == null)
{
return null;
public static AircraftPayloadEntity to(AircraftPayload model) {
return INSTANCE.innerTo(model);
}
return entityList.stream().map(AircraftPayloadDomainEntityConvert::toModel).collect(Collectors.toList());
public static List<AircraftPayload> fromList(List<AircraftPayloadEntity> entityList) {
return INSTANCE.innerFromList(entityList);
}
public static List<AircraftPayloadEntity> toList(List<AircraftPayload> modelList) {
return INSTANCE.innerToList(modelList);
}
}

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

@ -28,29 +28,29 @@ public class AircraftDomainImpl implements IAircraftDomain
@Override
public List<Aircraft> selectAircraftList(Aircraft aircraft)
{
AircraftEntity entity = AircraftDomainEntityConvert.toEntity(aircraft);
AircraftEntity entity = AircraftDomainEntityConvert.to(aircraft);
List<AircraftEntity> 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);
}

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

@ -28,43 +28,43 @@ public class AircraftPayloadDomainImpl implements IAircraftPayloadDomain
@Override
public List<AircraftPayload> selectAircraftPayloadList(AircraftPayload aircraftPayload)
{
AircraftPayloadEntity entity = AircraftPayloadDomainEntityConvert.toEntity(aircraftPayload);
AircraftPayloadEntity entity = AircraftPayloadDomainEntityConvert.to(aircraftPayload);
List<AircraftPayloadEntity> 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<AircraftPayload> selectAircraftPayloadByAircraftId(Long aircraftId)
{
List<AircraftPayloadEntity> entityList = aircraftPayloadMapper.selectAircraftPayloadListByAircraftId(aircraftId);
return AircraftPayloadDomainEntityConvert.toModelList(entityList);
return AircraftPayloadDomainEntityConvert.fromList(entityList);
}
@Override
public List<AircraftPayload> selectAircraftPayloadByPayloadId(Long payloadId)
{
List<AircraftPayloadEntity> entityList = aircraftPayloadMapper.selectAircraftPayloadListByPayloadId(payloadId);
return AircraftPayloadDomainEntityConvert.toModelList(entityList);
return AircraftPayloadDomainEntityConvert.fromList(entityList);
}
@Override
public List<AircraftPayload> selectAircraftPayloadByDockId(Long dockId)
{
List<AircraftPayloadEntity> 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);
}