修改convert

src/main/java/com/ruoyi/device/domain/convert/DockAircraftDomainEntityConvert.java

@@ -1,7 +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;
@@ -14,45 +17,29 @@ import java.util.stream.Collectors;
  * @author ruoyi
  * @date 2026-01-16
  */
-public class DockAircraftDomainEntityConvert
+public class DockAircraftDomainEntityConvert  extends BaseConvert<DockAircraftEntity, DockAircraft>
 {
-    /**
+
-     * Entity 转 Model
+    private static final DockAircraftDomainEntityConvert INSTANCE = new DockAircraftDomainEntityConvert();
-     */
+
-    public static DockAircraft toModel(DockAircraftEntity entity)
+    private DockAircraftDomainEntityConvert() {
-    {
+        super(DockAircraftEntity.class, DockAircraft.class);
-        if (entity == null)
-        {
-            return null;
-        }
-        DockAircraft model = new DockAircraft();
-        BeanUtils.copyProperties(entity, model);
-        return model;
     }
 
-    /**
+    public static DockAircraft from(DockAircraftEntity entity) {
-     * Model 转 Entity
+        return INSTANCE.innerFrom(entity);
-     */
-    public static DockAircraftEntity toEntity(DockAircraft model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        DockAircraftEntity entity = new DockAircraftEntity();
-        BeanUtils.copyProperties(model, entity);
-        return entity;
     }
 
-    /**
+    public static DockAircraftEntity to(DockAircraft model) {
-     * Entity List 转 Model List
+        return INSTANCE.innerTo(model);
-     */
-    public static List<DockAircraft> toModelList(List<DockAircraftEntity> entityList)
-    {
-        if (entityList == null)
-        {
-            return null;
-        }
-        return entityList.stream().map(DockAircraftDomainEntityConvert::toModel).collect(Collectors.toList());
     }
+
+    public static List<DockAircraft> fromList(List<DockAircraftEntity> entityList) {
+        return INSTANCE.innerFromList(entityList);
+    }
+
+    public static List<DockAircraftEntity> toList(List<DockAircraft> modelList) {
+        return INSTANCE.innerToList(modelList);
+    }
+
 }

src/main/java/com/ruoyi/device/domain/convert/DockDomainEntityConvert.java

@@ -1,7 +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.Payload;
 import com.ruoyi.device.mapper.entity.DockEntity;
+import com.ruoyi.device.mapper.entity.PayloadEntity;
 import org.springframework.beans.BeanUtils;
 
 import java.util.List;
@@ -14,45 +17,30 @@ import java.util.stream.Collectors;
  * @author ruoyi
  * @date 2026-01-16
  */
-public class DockDomainEntityConvert
+public class DockDomainEntityConvert extends BaseConvert<DockEntity, Dock>
 {
-    /**
+
-     * Entity 转 Model
+    private static final DockDomainEntityConvert INSTANCE = new DockDomainEntityConvert();
-     */
+
-    public static Dock toModel(DockEntity entity)
+    private DockDomainEntityConvert() {
-    {
+        super(DockEntity.class, Dock.class);
-        if (entity == null)
-        {
-            return null;
-        }
-        Dock model = new Dock();
-        BeanUtils.copyProperties(entity, model);
-        return model;
     }
 
-    /**
+    public static Dock from(DockEntity entity) {
-     * Model 转 Entity
+        return INSTANCE.innerFrom(entity);
-     */
-    public static DockEntity toEntity(Dock model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        DockEntity entity = new DockEntity();
-        BeanUtils.copyProperties(model, entity);
-        return entity;
     }
 
-    /**
+    public static DockEntity to(Dock model) {
-     * Entity List 转 Model List
+        return INSTANCE.innerTo(model);
-     */
-    public static List<Dock> toModelList(List<DockEntity> entityList)
-    {
-        if (entityList == null)
-        {
-            return null;
-        }
-        return entityList.stream().map(DockDomainEntityConvert::toModel).collect(Collectors.toList());
     }
+
+    public static List<Dock> fromList(List<DockEntity> entityList) {
+        return INSTANCE.innerFromList(entityList);
+    }
+
+    public static List<DockEntity> toList(List<Dock> modelList) {
+        return INSTANCE.innerToList(modelList);
+    }
+
+
 }

src/main/java/com/ruoyi/device/domain/convert/PayloadDomainEntityConvert.java

@@ -1,6 +1,11 @@
 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;
 
@@ -14,45 +19,28 @@ import java.util.stream.Collectors;
  * @author ruoyi
  * @date 2026-01-16
  */
-public class PayloadDomainEntityConvert
+public class PayloadDomainEntityConvert extends BaseConvert<PayloadEntity, Payload>
 {
-    /**
+
-     * Entity 转 Model
+    private static final PayloadDomainEntityConvert INSTANCE = new PayloadDomainEntityConvert();
-     */
+
-    public static Payload toModel(PayloadEntity entity)
+    private PayloadDomainEntityConvert() {
-    {
+        super(PayloadEntity.class, Payload.class);
-        if (entity == null)
-        {
-            return null;
-        }
-        Payload model = new Payload();
-        BeanUtils.copyProperties(entity, model);
-        return model;
     }
 
-    /**
+    public static Payload from(PayloadEntity entity) {
-     * Model 转 Entity
+        return INSTANCE.innerFrom(entity);
-     */
-    public static PayloadEntity toEntity(Payload model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        PayloadEntity entity = new PayloadEntity();
-        BeanUtils.copyProperties(model, entity);
-        return entity;
     }
 
-    /**
+    public static PayloadEntity to(Payload model) {
-     * Entity List 转 Model List
+        return INSTANCE.innerTo(model);
-     */
+    }
-    public static List<Payload> toModelList(List<PayloadEntity> entityList)
+
-    {
+    public static List<Payload> fromList(List<PayloadEntity> entityList) {
-        if (entityList == null)
+        return INSTANCE.innerFromList(entityList);
-        {
+    }
-            return null;
+
-        }
+    public static List<PayloadEntity> toList(List<Payload> modelList) {
-        return entityList.stream().map(PayloadDomainEntityConvert::toModel).collect(Collectors.toList());
+        return INSTANCE.innerToList(modelList);
     }
 }

src/main/java/com/ruoyi/device/domain/impl/DockAircraftDomainImpl.java

@@ -28,36 +28,36 @@ public class DockAircraftDomainImpl implements IDockAircraftDomain
     @Override
     public List<DockAircraft> selectDockAircraftList(DockAircraft dockAircraft)
     {
-        DockAircraftEntity entity = DockAircraftDomainEntityConvert.toEntity(dockAircraft);
+        DockAircraftEntity entity = DockAircraftDomainEntityConvert.to(dockAircraft);
         List<DockAircraftEntity> entityList = dockAircraftMapper.selectDockAircraftList(entity);
-        return DockAircraftDomainEntityConvert.toModelList(entityList);
+        return DockAircraftDomainEntityConvert.fromList(entityList);
     }
 
     @Override
     public DockAircraft selectDockAircraftById(Long id)
     {
         DockAircraftEntity entity = dockAircraftMapper.selectDockAircraftById(id);
-        return DockAircraftDomainEntityConvert.toModel(entity);
+        return DockAircraftDomainEntityConvert.from(entity);
     }
 
     @Override
     public List<DockAircraft> selectDockAircraftByDockId(Long dockId)
     {
         List<DockAircraftEntity> entityList = dockAircraftMapper.selectDockAircraftListByDockId(dockId);
-        return DockAircraftDomainEntityConvert.toModelList(entityList);
+        return DockAircraftDomainEntityConvert.fromList(entityList);
     }
 
     @Override
     public List<DockAircraft> selectDockAircraftByAircraftId(Long aircraftId)
     {
         List<DockAircraftEntity> entityList = dockAircraftMapper.selectDockAircraftListByAircraftId(aircraftId);
-        return DockAircraftDomainEntityConvert.toModelList(entityList);
+        return DockAircraftDomainEntityConvert.fromList(entityList);
     }
 
     @Override
     public int insertDockAircraft(DockAircraft dockAircraft)
     {
-        DockAircraftEntity entity = DockAircraftDomainEntityConvert.toEntity(dockAircraft);
+        DockAircraftEntity entity = DockAircraftDomainEntityConvert.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.toEntity(dockAircraft);
+        DockAircraftEntity entity = DockAircraftDomainEntityConvert.to(dockAircraft);
         return dockAircraftMapper.updateDockAircraft(entity);
     }
 

src/main/java/com/ruoyi/device/domain/impl/DockDomainImpl.java

@@ -28,29 +28,29 @@ public class DockDomainImpl implements IDockDomain
     @Override
     public List<Dock> selectDockList(Dock dock)
     {
-        DockEntity entity = DockDomainEntityConvert.toEntity(dock);
+        DockEntity entity = DockDomainEntityConvert.to(dock);
         List<DockEntity> entityList = dockMapper.selectDockList(entity);
-        return DockDomainEntityConvert.toModelList(entityList);
+        return DockDomainEntityConvert.fromList(entityList);
     }
 
     @Override
     public Dock selectDockByDockId(Long dockId)
     {
         DockEntity entity = dockMapper.selectDockByDockId(dockId);
-        return DockDomainEntityConvert.toModel(entity);
+        return DockDomainEntityConvert.from(entity);
     }
 
     @Override
     public Dock selectDockByDeviceId(Long deviceId)
     {
         DockEntity entity = dockMapper.selectDockByDeviceId(deviceId);
-        return DockDomainEntityConvert.toModel(entity);
+        return DockDomainEntityConvert.from(entity);
     }
 
     @Override
     public int insertDock(Dock dock)
     {
-        DockEntity entity = DockDomainEntityConvert.toEntity(dock);
+        DockEntity entity = DockDomainEntityConvert.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.toEntity(dock);
+        DockEntity entity = DockDomainEntityConvert.to(dock);
         return dockMapper.updateDock(entity);
     }
 

src/main/java/com/ruoyi/device/domain/impl/PayloadDomainImpl.java

@@ -28,22 +28,22 @@ public class PayloadDomainImpl implements IPayloadDomain
     @Override
     public List<Payload> selectPayloadList(Payload payload)
     {
-        PayloadEntity entity = PayloadDomainEntityConvert.toEntity(payload);
+        PayloadEntity entity = PayloadDomainEntityConvert.to(payload);
         List<PayloadEntity> entityList = payloadMapper.selectPayloadList(entity);
-        return PayloadDomainEntityConvert.toModelList(entityList);
+        return PayloadDomainEntityConvert.fromList(entityList);
     }
 
     @Override
     public Payload selectPayloadByPayloadId(Long payloadId)
     {
         PayloadEntity entity = payloadMapper.selectPayloadByPayloadId(payloadId);
-        return PayloadDomainEntityConvert.toModel(entity);
+        return PayloadDomainEntityConvert.from(entity);
     }
 
     @Override
     public int insertPayload(Payload payload)
     {
-        PayloadEntity entity = PayloadDomainEntityConvert.toEntity(payload);
+        PayloadEntity entity = PayloadDomainEntityConvert.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.toEntity(payload);
+        PayloadEntity entity = PayloadDomainEntityConvert.to(payload);
         return payloadMapper.updatePayload(entity);
     }