修改convert

pom.xml

@@ -93,6 +93,11 @@
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-mysql</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 

src/main/java/com/ruoyi/device/controller/AircraftController.java

@@ -4,9 +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.AircraftDetailVOConvert;
 import com.ruoyi.device.service.api.IAircraftService;
 import com.ruoyi.device.service.api.IBufferDeviceService;
-import com.ruoyi.device.service.convert.BufferDeviceConvert;
 import com.ruoyi.device.service.dto.AircraftDetailDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -38,7 +38,7 @@ public class AircraftController extends BaseController
     public R<AircraftDetailVO> getAircraftDetail(@PathVariable("aircraftId") Long aircraftId)
     {
         AircraftDetailDTO dto = bufferDeviceService.getAircraftDetailById(aircraftId);
-        AircraftDetailVO vo = BufferDeviceConvert.toVO(dto);
+        AircraftDetailVO vo = AircraftDetailVOConvert.from(dto);
         return R.ok(vo);
     }
 }

src/main/java/com/ruoyi/device/controller/DeviceTempController.java

@@ -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.toDTO(deviceTemp);
+        DeviceTempDTO dto = DeviceTempVOConvert.to(deviceTemp);
         List<DeviceTempDTO> dtoList = deviceTempService.selectDeviceTempList(dto);
         // Service DTO → API Domain
-        List<DeviceTempVO> list = DeviceTempControllerConvert.toApiDomainList(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.toVO(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.toVO(dto);
+        DeviceTempVO deviceTemp = DeviceTempVOConvert.from(dto);
         return success(deviceTemp);
     }
 }

src/main/java/com/ruoyi/device/controller/DockController.java

@@ -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.service.convert.BufferDeviceConvert;
+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.toVOList(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 = BufferDeviceConvert.toVO(dto);
+        DockDetailVO vo = DockDetailVOConvert.from(dto);
         return R.ok(vo);
     }
 }

src/main/java/com/ruoyi/device/controller/GroupController.java

@@ -3,16 +3,18 @@ package com.ruoyi.device.controller;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.device.api.domain.DockVO;
-import com.ruoyi.device.api.domain.GroupVO;
 import com.ruoyi.device.api.domain.GroupCreateRequest;
 import com.ruoyi.device.api.domain.SwitchDockGroupRequest;
+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;
+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.controller.convert.GroupControllerConvert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -27,6 +29,9 @@ public class GroupController extends BaseController
 {
     @Autowired
     private IGroupService groupService;
+
+    @Autowired
+    private IBufferDeviceService bufferDeviceService;
     /**
      * 创建分组
      *
@@ -79,9 +84,14 @@ public class GroupController extends BaseController
     @GetMapping("/docks/{groupId}")
     public R<List<DockVO>> getDocksByGroupId(@PathVariable("groupId") Long groupId)
     {
-        List<DockDTO> dtoList = groupService.getDocksByGroupId(groupId);
-        List<DockVO> voList = GroupControllerConvert.toDockVOList(dtoList);
-        return R.ok(voList);
+        List<DockGroupDTO> groupDTOS = groupService.getDocksByGroupId(groupId);
+        List<DockDetailDTO> dtoList = new ArrayList<>();
+        for (DockGroupDTO dockGroupDTO : groupDTOS) {
+            DockDetailDTO dockDetailDTO =  bufferDeviceService.getDockDetailById(dockGroupDTO.getDockId());
+            dtoList.add(dockDetailDTO);
+        }
+
+        return R.ok(DockVOConvert.fromDockDetailDTOList(dtoList));
     }
 
     /**

src/main/java/com/ruoyi/device/controller/convert/AircraftControllerConvert.java

@@ -1,11 +0,0 @@
-package com.ruoyi.device.controller.convert;
-
-/**
- * 无人机Controller转换器
- *
- * @author ruoyi
- * @date 2026-01-20
- */
-public class AircraftControllerConvert
-{
-}

src/main/java/com/ruoyi/device/controller/convert/AircraftDetailVOConvert.java

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

src/main/java/com/ruoyi/device/controller/convert/DeviceTempControllerConvert.java

@@ -1,58 +0,0 @@
-package com.ruoyi.device.controller.convert;
-
-import com.ruoyi.device.api.domain.DeviceTempVO;
-import com.ruoyi.device.service.dto.DeviceTempDTO;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 设备临时表Controller层转换器
- * API Domain ↔ Service DTO
- *
- * @author ruoyi
- * @date 2026-01-15
- */
-public class DeviceTempControllerConvert
-{
-    /**
-     * DTO 转 API Domain
-     */
-    public static DeviceTempVO toVO(DeviceTempDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-        DeviceTempVO apiDomain = new DeviceTempVO();
-        BeanUtils.copyProperties(dto, apiDomain);
-        return apiDomain;
-    }
-
-    /**
-     * API Domain 转 DTO
-     */
-    public static DeviceTempDTO toDTO(DeviceTempVO apiDomain)
-    {
-        if (apiDomain == null)
-        {
-            return null;
-        }
-        DeviceTempDTO dto = new DeviceTempDTO();
-        BeanUtils.copyProperties(apiDomain, dto);
-        return dto;
-    }
-
-    /**
-     * DTO List 转 API Domain List
-     */
-    public static List<DeviceTempVO> toApiDomainList(List<DeviceTempDTO> dtoList)
-    {
-        if (dtoList == null)
-        {
-            return null;
-        }
-        return dtoList.stream().map(DeviceTempControllerConvert::toVO).collect(Collectors.toList());
-    }
-}

src/main/java/com/ruoyi/device/controller/convert/DeviceTempVOConvert.java

@@ -0,0 +1,56 @@
+package com.ruoyi.device.controller.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.api.domain.DeviceTempVO;
+import com.ruoyi.device.service.dto.DeviceTempDTO;
+
+import java.util.List;
+
+/**
+ * 设备临时表Controller层转换器
+ * API Domain ↔ Service DTO
+ *
+ * @author ruoyi
+ * @date 2026-01-15
+ */
+public class DeviceTempVOConvert extends BaseConvert<DeviceTempDTO, DeviceTempVO>
+{
+
+    private static final DeviceTempVOConvert INSTANCE = new DeviceTempVOConvert();
+
+    private DeviceTempVOConvert() {
+        super(DeviceTempDTO.class, DeviceTempVO.class);
+    }
+
+    /**
+     * DTO 转 API Domain
+     */
+    public static DeviceTempVO from(DeviceTempDTO dto)
+    {
+        return INSTANCE.innerFrom(dto);
+    }
+
+    /**
+     * API Domain 转 DTO
+     */
+    public static DeviceTempDTO to(DeviceTempVO apiDomain)
+    {
+        return INSTANCE.innerTo(apiDomain);
+    }
+
+    /**
+     * DTO List 转 API Domain List
+     */
+    public static List<DeviceTempVO> fromList(List<DeviceTempDTO> dtoList)
+    {
+        return INSTANCE.innerFromList(dtoList);
+    }
+
+    /**
+     * API Domain List 转 DTO List
+     */
+    public static List<DeviceTempDTO> toList(List<DeviceTempVO> apiDomainList)
+    {
+        return INSTANCE.innerToList(apiDomainList);
+    }
+}

src/main/java/com/ruoyi/device/controller/convert/DockControllerConvert.java

@@ -1,79 +0,0 @@
-package com.ruoyi.device.controller.convert;
-
-import com.ruoyi.device.api.domain.DockVO;
-import com.ruoyi.device.service.dto.DockDTO;
-import org.springframework.beans.BeanUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 机场Controller转换器
- *
- * @author ruoyi
- * @date 2026-01-20
- */
-public class DockControllerConvert
-{
-    /**
-     * DTO 转 VO
-     */
-    public static DockVO toVO(DockDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-        DockVO vo = new DockVO();
-        BeanUtils.copyProperties(dto, vo);
-        return vo;
-    }
-
-    /**
-     * VO 转 DTO
-     */
-    public static DockDTO toDTO(DockVO vo)
-    {
-        if (vo == null)
-        {
-            return null;
-        }
-        DockDTO dto = new DockDTO();
-        BeanUtils.copyProperties(vo, dto);
-        return dto;
-    }
-
-    /**
-     * DTO List 转 VO List
-     */
-    public static List<DockVO> toVOList(List<DockDTO> dtoList)
-    {
-        if (dtoList == null || dtoList.isEmpty())
-        {
-            return new ArrayList<>();
-        }
-        List<DockVO> voList = new ArrayList<>();
-        for (DockDTO dto : dtoList)
-        {
-            voList.add(toVO(dto));
-        }
-        return voList;
-    }
-
-    /**
-     * VO List 转 DTO List
-     */
-    public static List<DockDTO> toDTOList(List<DockVO> voList)
-    {
-        if (voList == null || voList.isEmpty())
-        {
-            return new ArrayList<>();
-        }
-        List<DockDTO> dtoList = new ArrayList<>();
-        for (DockVO vo : voList)
-        {
-            dtoList.add(toDTO(vo));
-        }
-        return dtoList;
-    }
-}

src/main/java/com/ruoyi/device/controller/convert/DockDetailVOConvert.java

@@ -0,0 +1,88 @@
+package com.ruoyi.device.controller.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.api.domain.DockDetailVO;
+import com.ruoyi.device.service.dto.DockDetailDTO;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 设备缓冲服务转换类
+ * 用于 DTO 到 VO 的转换
+ *
+ * @author ruoyi
+ * @date 2026-01-20
+ */
+public class DockDetailVOConvert extends BaseConvert<DockDetailDTO, DockDetailVO>
+{
+
+    private static final DockDetailVOConvert INSTANCE = new DockDetailVOConvert();
+
+    private DockDetailVOConvert() {
+        super(DockDetailDTO.class, DockDetailVO.class);
+    }
+
+    public static DockDetailVO from(DockDetailDTO dto)
+    {
+        if (dto == null)
+        {
+            return null;
+        }
+
+        DockDetailVO vo = new DockDetailVO();
+
+        vo.setDockId(dto.getDockId());
+        vo.setDockName(dto.getDockName());
+        vo.setManufacturerName(dto.getManufacturerName());
+        vo.setFirmwareVersion(dto.getFirmwareVersion());
+        vo.setSnNumber(dto.getSnNumber());
+        vo.setBindTime(dto.getBindTime());
+        vo.setMaintenanceDays(dto.getMaintenanceDays());
+        vo.setDockName(dto.getDockName());
+        vo.setDockStatus(dto.getDockStatus());
+        vo.setBackupLongitude(dto.getBackupLongitude());
+        vo.setBackupLatitude(dto.getBackupLatitude());
+        vo.setRunningDuration(dto.getRunningDuration());
+        vo.setMissionCount(dto.getMissionCount());
+        vo.setWindSpeed(dto.getWindSpeed());
+        vo.setRainfall(dto.getRainfall());
+        vo.setEnvironmentTemperature(dto.getEnvironmentTemperature());
+        vo.setEnvironmentHumidity(dto.getEnvironmentHumidity());
+        vo.setNetworkType(dto.getNetworkType());
+        vo.setNetworkDelay(dto.getNetworkDelay());
+        vo.setAirConditionerStatus(dto.getAirConditionerStatus());
+        vo.setCabinDoorStatus(dto.getCabinDoorStatus());
+        vo.setDockRunStatus(dto.getDockRunStatus());
+        vo.setInternalCamera(dto.getInternalCamera());
+        vo.setExternalCamera(dto.getExternalCamera());
+        vo.setChargingStatus(dto.getChargingStatus());
+        vo.setCabinTemperature(dto.getCabinTemperature());
+        vo.setCabinHumidity(dto.getCabinHumidity());
+        vo.setElevatorPosition(dto.getElevatorPosition());
+        vo.setXAxisClampStatus(dto.getXAxisClampStatus());
+        vo.setYAxisClampStatus(dto.getYAxisClampStatus());
+
+        return vo;
+    }
+
+    public static DockDetailDTO to(DockDetailVO vo)
+    {
+        return INSTANCE.innerTo(vo);
+    }
+
+    public static List<DockDetailVO> fromList(List<DockDetailDTO> dtoList)
+    {
+        if (dtoList == null)
+        {
+            return null;
+        }
+        return dtoList.stream().map(DockDetailVOConvert::from).collect(Collectors.toList());
+    }
+
+    public static List<DockDetailDTO> toList(List<DockDetailVO> voList)
+    {
+        return INSTANCE.innerToList(voList);
+    }
+
+}

src/main/java/com/ruoyi/device/controller/convert/DockVOConvert.java

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

src/main/java/com/ruoyi/device/controller/convert/GroupControllerConvert.java

@@ -1,126 +0,0 @@
-package com.ruoyi.device.controller.convert;
-
-import com.ruoyi.device.api.domain.DockVO;
-import com.ruoyi.device.api.domain.GroupVO;
-import com.ruoyi.device.service.dto.DockDTO;
-import com.ruoyi.device.service.dto.GroupDTO;
-import org.springframework.beans.BeanUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 分组Controller转换器
- *
- * @author ruoyi
- * @date 2026-01-20
- */
-public class GroupControllerConvert
-{
-    /**
-     * DTO 转 VO
-     */
-    public static GroupVO toVO(GroupDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-        GroupVO vo = new GroupVO();
-        BeanUtils.copyProperties(dto, vo);
-        return vo;
-    }
-
-    /**
-     * VO 转 DTO
-     */
-    public static GroupDTO toDTO(GroupVO vo)
-    {
-        if (vo == null)
-        {
-            return null;
-        }
-        GroupDTO dto = new GroupDTO();
-        BeanUtils.copyProperties(vo, dto);
-        return dto;
-    }
-
-    /**
-     * DTO 转 VO
-     */
-    public static DockVO toVO(DockDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-        DockVO vo = new DockVO();
-        BeanUtils.copyProperties(dto, vo);
-        return vo;
-    }
-
-    /**
-     * VO 转 DTO
-     */
-    public static DockDTO toDTO(DockVO vo)
-    {
-        if (vo == null)
-        {
-            return null;
-        }
-        DockDTO dto = new DockDTO();
-        BeanUtils.copyProperties(vo, dto);
-        return dto;
-    }
-
-    /**
-     * DTO List 转 VO List
-     */
-    public static List<GroupVO> toVOList(List<GroupDTO> dtoList)
-    {
-        if (dtoList == null || dtoList.isEmpty())
-        {
-            return new ArrayList<>();
-        }
-        List<GroupVO> voList = new ArrayList<>();
-        for (GroupDTO dto : dtoList)
-        {
-            voList.add(toVO(dto));
-        }
-        return voList;
-    }
-
-    /**
-     * Dock DTO List 转 Dock VO List
-     */
-    public static List<DockVO> toDockVOList(List<DockDTO> dtoList)
-    {
-        if (dtoList == null || dtoList.isEmpty())
-        {
-            return new ArrayList<>();
-        }
-        List<DockVO> voList = new ArrayList<>();
-        for (DockDTO dto : dtoList)
-        {
-            voList.add(toVO(dto));
-        }
-        return voList;
-    }
-
-    /**
-     * VO List 转 DTO List
-     */
-    public static List<GroupDTO> toDTOList(List<GroupVO> voList)
-    {
-        if (voList == null || voList.isEmpty())
-        {
-            return new ArrayList<>();
-        }
-        List<GroupDTO> dtoList = new ArrayList<>();
-        for (GroupVO vo : voList)
-        {
-            dtoList.add(toDTO(vo));
-        }
-        return dtoList;
-    }
-}

src/main/java/com/ruoyi/device/controller/convert/GroupVOConvert.java

@@ -0,0 +1,55 @@
+package com.ruoyi.device.controller.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.api.domain.GroupVO;
+import com.ruoyi.device.service.dto.GroupDTO;
+
+import java.util.List;
+
+/**
+ * 分组Controller转换器
+ *
+ * @author ruoyi
+ * @date 2026-01-20
+ */
+public class GroupVOConvert extends BaseConvert<GroupDTO, GroupVO>
+{
+
+    private static final GroupVOConvert INSTANCE = new GroupVOConvert();
+
+    private GroupVOConvert() {
+        super(GroupDTO.class, GroupVO.class);
+    }
+
+    /**
+     * DTO 转 VO
+     */
+    public static GroupVO from(GroupDTO dto)
+    {
+        return INSTANCE.innerFrom(dto);
+    }
+
+    /**
+     * VO 转 DTO
+     */
+    public static GroupDTO to(GroupVO vo)
+    {
+        return INSTANCE.innerTo(vo);
+    }
+
+    /**
+     * DTO List 转 VO List
+     */
+    public static List<GroupVO> fromList(List<GroupDTO> dtoList)
+    {
+        return INSTANCE.innerFromList(dtoList);
+    }
+
+    /**
+     * VO List 转 DTO List
+     */
+    public static List<GroupDTO> toList(List<GroupVO> voList)
+    {
+        return INSTANCE.innerToList(voList);
+    }
+}

src/main/java/com/ruoyi/device/controller/convert/NetworkVOConvert.java

@@ -0,0 +1,39 @@
+package com.ruoyi.device.controller.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.api.domain.NetworkVO;
+import com.ruoyi.device.service.dto.NetworkDTO;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class NetworkVOConvert extends BaseConvert<NetworkDTO, NetworkVO>
+{
+
+    private static final NetworkVOConvert INSTANCE = new NetworkVOConvert();
+
+    private NetworkVOConvert() {
+        super(NetworkDTO.class, NetworkVO.class);
+    }
+
+    public static NetworkVO from(NetworkDTO dto)
+    {
+        return INSTANCE.innerFrom(dto);
+    }
+
+    public static NetworkDTO to(NetworkVO vo)
+    {
+        return INSTANCE.innerTo(vo);
+    }
+
+    public static List<NetworkVO> fromList(List<NetworkDTO> dtoList)
+    {
+        return INSTANCE.innerFromList(dtoList);
+    }
+
+    public static List<NetworkDTO> toList(List<NetworkVO> voList)
+    {
+        return INSTANCE.innerToList(voList);
+    }
+
+}

src/main/java/com/ruoyi/device/controller/convert/PayloadDetailVOConvert.java

@@ -0,0 +1,37 @@
+package com.ruoyi.device.controller.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.api.domain.PayloadDetailVO;
+import com.ruoyi.device.service.dto.PayloadDTO;
+
+import java.util.List;
+
+public class PayloadDetailVOConvert extends BaseConvert<PayloadDTO, PayloadDetailVO>
+{
+
+    private static final PayloadDetailVOConvert INSTANCE = new PayloadDetailVOConvert();
+
+    private PayloadDetailVOConvert() {
+        super(PayloadDTO.class, PayloadDetailVO.class);
+    }
+
+    public static PayloadDetailVO from(PayloadDTO dto)
+    {
+        return INSTANCE.innerFrom(dto);
+    }
+
+    public static PayloadDTO to(PayloadDetailVO vo)
+    {
+        return INSTANCE.innerTo(vo);
+    }
+
+    public static List<PayloadDetailVO> fromList(List<PayloadDTO> dtoList)
+    {
+        return INSTANCE.innerFromList(dtoList);
+    }
+
+    public static List<PayloadDTO> toList(List<PayloadDetailVO> voList)
+    {
+        return INSTANCE.innerToList(voList);
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.ruoyi.device.domain.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.domain.model.Aircraft;
+import com.ruoyi.device.mapper.entity.AircraftEntity;
+
+import java.util.List;
+
+/**
+ * 无人机Domain层转换器
+ * Domain Model ↔ Mapper Entity
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class AircraftConvert extends BaseConvert<AircraftEntity, Aircraft> {
+
+    private static final AircraftConvert INSTANCE = new AircraftConvert();
+
+    private AircraftConvert() {
+        super(AircraftEntity.class, Aircraft.class);
+    }
+
+    public static Aircraft from(AircraftEntity entity) {
+        return INSTANCE.innerFrom(entity);
+    }
+
+    public static AircraftEntity to(Aircraft model) {
+        return INSTANCE.innerTo(model);
+    }
+
+    public static List<Aircraft> fromList(List<AircraftEntity> entityList) {
+        return INSTANCE.innerFromList(entityList);
+    }
+
+    public static List<AircraftEntity> toList(List<Aircraft> modelList) {
+        return INSTANCE.innerToList(modelList);
+    }
+}

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

@@ -1,58 +0,0 @@
-package com.ruoyi.device.domain.convert;
-
-import com.ruoyi.device.domain.model.Aircraft;
-import com.ruoyi.device.mapper.entity.AircraftEntity;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 无人机Domain层转换器
- * Domain Model ↔ Mapper Entity
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class AircraftDomainConvert
-{
-    /**
-     * Entity 转 Model
-     */
-    public static Aircraft toModel(AircraftEntity entity)
-    {
-        if (entity == null)
-        {
-            return null;
-        }
-        Aircraft model = new Aircraft();
-        BeanUtils.copyProperties(entity, model);
-        return model;
-    }
-
-    /**
-     * Model 转 Entity
-     */
-    public static AircraftEntity toEntity(Aircraft model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        AircraftEntity entity = new AircraftEntity();
-        BeanUtils.copyProperties(model, entity);
-        return entity;
-    }
-
-    /**
-     * Entity List 转 Model List
-     */
-    public static List<Aircraft> toModelList(List<AircraftEntity> entityList)
-    {
-        if (entityList == null)
-        {
-            return null;
-        }
-        return entityList.stream().map(AircraftDomainConvert::toModel).collect(Collectors.toList());
-    }
-}

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

@@ -0,0 +1,40 @@
+package com.ruoyi.device.domain.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.domain.model.AircraftPayload;
+import com.ruoyi.device.mapper.entity.AircraftPayloadEntity;
+
+import java.util.List;
+
+/**
+ * 无人机挂载关联Domain层转换器
+ * Domain Model ↔ Mapper Entity
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class AircraftPayloadConvert extends BaseConvert<AircraftPayloadEntity, AircraftPayload> {
+
+    private static final AircraftPayloadConvert INSTANCE = new AircraftPayloadConvert();
+
+    private AircraftPayloadConvert() {
+        super(AircraftPayloadEntity.class, AircraftPayload.class);
+    }
+
+    public static AircraftPayload from(AircraftPayloadEntity entity) {
+        return INSTANCE.innerFrom(entity);
+    }
+
+    public static AircraftPayloadEntity to(AircraftPayload model) {
+        return INSTANCE.innerTo(model);
+    }
+
+    public static List<AircraftPayload> fromList(List<AircraftPayloadEntity> entityList) {
+        return INSTANCE.innerFromList(entityList);
+    }
+
+    public static List<AircraftPayloadEntity> toList(List<AircraftPayload> modelList) {
+        return INSTANCE.innerToList(modelList);
+    }
+
+}

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

@@ -1,58 +0,0 @@
-package com.ruoyi.device.domain.convert;
-
-import com.ruoyi.device.domain.model.AircraftPayload;
-import com.ruoyi.device.mapper.entity.AircraftPayloadEntity;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 无人机挂载关联Domain层转换器
- * Domain Model ↔ Mapper Entity
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class AircraftPayloadDomainConvert
-{
-    /**
-     * Entity 转 Model
-     */
-    public static AircraftPayload toModel(AircraftPayloadEntity entity)
-    {
-        if (entity == null)
-        {
-            return null;
-        }
-        AircraftPayload model = new AircraftPayload();
-        BeanUtils.copyProperties(entity, model);
-        return model;
-    }
-
-    /**
-     * Model 转 Entity
-     */
-    public static AircraftPayloadEntity toEntity(AircraftPayload model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        AircraftPayloadEntity entity = new AircraftPayloadEntity();
-        BeanUtils.copyProperties(model, entity);
-        return entity;
-    }
-
-    /**
-     * Entity List 转 Model List
-     */
-    public static List<AircraftPayload> toModelList(List<AircraftPayloadEntity> entityList)
-    {
-        if (entityList == null)
-        {
-            return null;
-        }
-        return entityList.stream().map(AircraftPayloadDomainConvert::toModel).collect(Collectors.toList());
-    }
-}

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

@@ -0,0 +1,39 @@
+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 java.util.List;
+
+/**
+ * 设备Domain层转换器
+ * Domain Model ↔ Mapper Entity
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class DeviceConvert extends BaseConvert<DeviceEntity, Device> {
+
+    private static final DeviceConvert INSTANCE = new DeviceConvert();
+
+    private DeviceConvert() {
+        super(DeviceEntity.class, Device.class);
+    }
+
+    public static Device from(DeviceEntity entity) {
+        return INSTANCE.innerFrom(entity);
+    }
+
+    public static DeviceEntity to(Device model) {
+        return INSTANCE.innerTo(model);
+    }
+
+    public static List<Device> fromList(List<DeviceEntity> entityList) {
+        return INSTANCE.innerFromList(entityList);
+    }
+
+    public static List<DeviceEntity> toList(List<Device> modelList) {
+        return INSTANCE.innerToList(modelList);
+    }
+}

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

@@ -1,58 +0,0 @@
-package com.ruoyi.device.domain.convert;
-
-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层转换器
- * Domain Model ↔ Mapper Entity
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class DeviceDomainConvert
-{
-    /**
-     * Entity 转 Model
-     */
-    public static Device toModel(DeviceEntity entity)
-    {
-        if (entity == null)
-        {
-            return null;
-        }
-        Device model = new Device();
-        BeanUtils.copyProperties(entity, model);
-        return model;
-    }
-
-    /**
-     * Model 转 Entity
-     */
-    public static DeviceEntity toEntity(Device model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        DeviceEntity entity = new DeviceEntity();
-        BeanUtils.copyProperties(model, entity);
-        return entity;
-    }
-
-    /**
-     * Entity List 转 Model List
-     */
-    public static List<Device> toModelList(List<DeviceEntity> entityList)
-    {
-        if (entityList == null)
-        {
-            return null;
-        }
-        return entityList.stream().map(DeviceDomainConvert::toModel).collect(Collectors.toList());
-    }
-}

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

@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
  * @author ruoyi
  * @date 2026-01-15
  */
-public class DeviceTempDomainConvert
+public class DeviceTempDomainEntityConvert
 {
     /**
      * Entity 转 Model
@@ -53,6 +53,6 @@ public class DeviceTempDomainConvert
         {
             return null;
         }
-        return entityList.stream().map(DeviceTempDomainConvert::toModel).collect(Collectors.toList());
+        return entityList.stream().map(DeviceTempDomainEntityConvert::toModel).collect(Collectors.toList());
     }
 }

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

@@ -0,0 +1,41 @@
+package com.ruoyi.device.domain.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.domain.model.DockAircraft;
+import com.ruoyi.device.mapper.entity.DockAircraftEntity;
+
+import java.util.List;
+
+/**
+ * 机场无人机关联Domain层转换器
+ * Domain Model ↔ Mapper Entity
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class DockAircraftConvert extends BaseConvert<DockAircraftEntity, DockAircraft>
+{
+
+    private static final DockAircraftConvert INSTANCE = new DockAircraftConvert();
+
+    private DockAircraftConvert() {
+        super(DockAircraftEntity.class, DockAircraft.class);
+    }
+
+    public static DockAircraft from(DockAircraftEntity entity) {
+        return INSTANCE.innerFrom(entity);
+    }
+
+    public static DockAircraftEntity to(DockAircraft model) {
+        return INSTANCE.innerTo(model);
+    }
+
+    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/DockAircraftDomainConvert.java

@@ -1,58 +0,0 @@
-package com.ruoyi.device.domain.convert;
-
-import com.ruoyi.device.domain.model.DockAircraft;
-import com.ruoyi.device.mapper.entity.DockAircraftEntity;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 机场无人机关联Domain层转换器
- * Domain Model ↔ Mapper Entity
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class DockAircraftDomainConvert
-{
-    /**
-     * Entity 转 Model
-     */
-    public static DockAircraft toModel(DockAircraftEntity entity)
-    {
-        if (entity == null)
-        {
-            return null;
-        }
-        DockAircraft model = new DockAircraft();
-        BeanUtils.copyProperties(entity, model);
-        return model;
-    }
-
-    /**
-     * Model 转 Entity
-     */
-    public static DockAircraftEntity toEntity(DockAircraft model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        DockAircraftEntity entity = new DockAircraftEntity();
-        BeanUtils.copyProperties(model, entity);
-        return entity;
-    }
-
-    /**
-     * Entity List 转 Model List
-     */
-    public static List<DockAircraft> toModelList(List<DockAircraftEntity> entityList)
-    {
-        if (entityList == null)
-        {
-            return null;
-        }
-        return entityList.stream().map(DockAircraftDomainConvert::toModel).collect(Collectors.toList());
-    }
-}

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

@@ -0,0 +1,42 @@
+package com.ruoyi.device.domain.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.domain.model.Dock;
+import com.ruoyi.device.mapper.entity.DockEntity;
+
+import java.util.List;
+
+/**
+ * 机场Domain层转换器
+ * Domain Model ↔ Mapper Entity
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class DockConvert extends BaseConvert<DockEntity, Dock>
+{
+
+    private static final DockConvert INSTANCE = new DockConvert();
+
+    private DockConvert() {
+        super(DockEntity.class, Dock.class);
+    }
+
+    public static Dock from(DockEntity entity) {
+        return INSTANCE.innerFrom(entity);
+    }
+
+    public static DockEntity to(Dock model) {
+        return INSTANCE.innerTo(model);
+    }
+
+    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/DockDomainConvert.java

@@ -1,58 +0,0 @@
-package com.ruoyi.device.domain.convert;
-
-import com.ruoyi.device.domain.model.Dock;
-import com.ruoyi.device.mapper.entity.DockEntity;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 机场Domain层转换器
- * Domain Model ↔ Mapper Entity
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class DockDomainConvert
-{
-    /**
-     * Entity 转 Model
-     */
-    public static Dock toModel(DockEntity entity)
-    {
-        if (entity == null)
-        {
-            return null;
-        }
-        Dock model = new Dock();
-        BeanUtils.copyProperties(entity, model);
-        return model;
-    }
-
-    /**
-     * Model 转 Entity
-     */
-    public static DockEntity toEntity(Dock model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        DockEntity entity = new DockEntity();
-        BeanUtils.copyProperties(model, entity);
-        return entity;
-    }
-
-    /**
-     * Entity List 转 Model List
-     */
-    public static List<Dock> toModelList(List<DockEntity> entityList)
-    {
-        if (entityList == null)
-        {
-            return null;
-        }
-        return entityList.stream().map(DockDomainConvert::toModel).collect(Collectors.toList());
-    }
-}

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

@@ -0,0 +1,39 @@
+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 java.util.List;
+
+/**
+ * 机场分组关联Domain层转换器
+ * Domain Model ↔ Mapper Entity
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class DockGroupConvert extends BaseConvert<DockGroupEntity, DockGroup> {
+
+    private static final DockGroupConvert INSTANCE = new DockGroupConvert();
+
+    private DockGroupConvert() {
+        super(DockGroupEntity.class, DockGroup.class);
+    }
+
+    public static DockGroup from(DockGroupEntity entity) {
+        return INSTANCE.innerFrom(entity);
+    }
+
+    public static DockGroupEntity to(DockGroup model) {
+        return INSTANCE.innerTo(model);
+    }
+
+    public static List<DockGroup> fromList(List<DockGroupEntity> entityList) {
+        return INSTANCE.innerFromList(entityList);
+    }
+
+    public static List<DockGroupEntity> toList(List<DockGroup> modelList) {
+        return INSTANCE.innerToList(modelList);
+    }
+}

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

@@ -1,58 +0,0 @@
-package com.ruoyi.device.domain.convert;
-
-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层转换器
- * Domain Model ↔ Mapper Entity
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class DockGroupDomainConvert
-{
-    /**
-     * Entity 转 Model
-     */
-    public static DockGroup toModel(DockGroupEntity entity)
-    {
-        if (entity == null)
-        {
-            return null;
-        }
-        DockGroup model = new DockGroup();
-        BeanUtils.copyProperties(entity, model);
-        return model;
-    }
-
-    /**
-     * Model 转 Entity
-     */
-    public static DockGroupEntity toEntity(DockGroup model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        DockGroupEntity entity = new DockGroupEntity();
-        BeanUtils.copyProperties(model, entity);
-        return entity;
-    }
-
-    /**
-     * Entity List 转 Model List
-     */
-    public static List<DockGroup> toModelList(List<DockGroupEntity> entityList)
-    {
-        if (entityList == null)
-        {
-            return null;
-        }
-        return entityList.stream().map(DockGroupDomainConvert::toModel).collect(Collectors.toList());
-    }
-}

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

@@ -0,0 +1,39 @@
+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 java.util.List;
+
+/**
+ * 分组Domain层转换器
+ * Domain Model ↔ Mapper Entity
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class GroupConvert extends BaseConvert<GroupEntity, Group> {
+
+    private static final GroupConvert INSTANCE = new GroupConvert();
+
+    private GroupConvert() {
+        super(GroupEntity.class, Group.class);
+    }
+
+    public static Group from(GroupEntity entity) {
+        return INSTANCE.innerFrom(entity);
+    }
+
+    public static GroupEntity to(Group model) {
+        return INSTANCE.innerTo(model);
+    }
+
+    public static List<Group> fromList(List<GroupEntity> entityList) {
+        return INSTANCE.innerFromList(entityList);
+    }
+
+    public static List<GroupEntity> toList(List<Group> modelList) {
+        return INSTANCE.innerToList(modelList);
+    }
+}

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

@@ -1,58 +0,0 @@
-package com.ruoyi.device.domain.convert;
-
-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层转换器
- * Domain Model ↔ Mapper Entity
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class GroupDomainConvert
-{
-    /**
-     * Entity 转 Model
-     */
-    public static Group toModel(GroupEntity entity)
-    {
-        if (entity == null)
-        {
-            return null;
-        }
-        Group model = new Group();
-        BeanUtils.copyProperties(entity, model);
-        return model;
-    }
-
-    /**
-     * Model 转 Entity
-     */
-    public static GroupEntity toEntity(Group model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        GroupEntity entity = new GroupEntity();
-        BeanUtils.copyProperties(model, entity);
-        return entity;
-    }
-
-    /**
-     * Entity List 转 Model List
-     */
-    public static List<Group> toModelList(List<GroupEntity> entityList)
-    {
-        if (entityList == null)
-        {
-            return null;
-        }
-        return entityList.stream().map(GroupDomainConvert::toModel).collect(Collectors.toList());
-    }
-}

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

@@ -0,0 +1,40 @@
+package com.ruoyi.device.domain.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.domain.model.Payload;
+import com.ruoyi.device.mapper.entity.PayloadEntity;
+
+import java.util.List;
+
+/**
+ * 挂载Domain层转换器
+ * Domain Model ↔ Mapper Entity
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class PayloadConvert extends BaseConvert<PayloadEntity, Payload>
+{
+
+    private static final PayloadConvert INSTANCE = new PayloadConvert();
+
+    private PayloadConvert() {
+        super(PayloadEntity.class, Payload.class);
+    }
+
+    public static Payload from(PayloadEntity entity) {
+        return INSTANCE.innerFrom(entity);
+    }
+
+    public static PayloadEntity to(Payload model) {
+        return INSTANCE.innerTo(model);
+    }
+
+    public static List<Payload> fromList(List<PayloadEntity> entityList) {
+        return INSTANCE.innerFromList(entityList);
+    }
+
+    public static List<PayloadEntity> toList(List<Payload> modelList) {
+        return INSTANCE.innerToList(modelList);
+    }
+}

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

@@ -1,58 +0,0 @@
-package com.ruoyi.device.domain.convert;
-
-import com.ruoyi.device.domain.model.Payload;
-import com.ruoyi.device.mapper.entity.PayloadEntity;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 挂载Domain层转换器
- * Domain Model ↔ Mapper Entity
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class PayloadDomainConvert
-{
-    /**
-     * Entity 转 Model
-     */
-    public static Payload toModel(PayloadEntity entity)
-    {
-        if (entity == null)
-        {
-            return null;
-        }
-        Payload model = new Payload();
-        BeanUtils.copyProperties(entity, model);
-        return model;
-    }
-
-    /**
-     * Model 转 Entity
-     */
-    public static PayloadEntity toEntity(Payload model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        PayloadEntity entity = new PayloadEntity();
-        BeanUtils.copyProperties(model, entity);
-        return entity;
-    }
-
-    /**
-     * Entity List 转 Model List
-     */
-    public static List<Payload> toModelList(List<PayloadEntity> entityList)
-    {
-        if (entityList == null)
-        {
-            return null;
-        }
-        return entityList.stream().map(PayloadDomainConvert::toModel).collect(Collectors.toList());
-    }
-}

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

@@ -1,7 +1,7 @@
 package com.ruoyi.device.domain.impl;
 
 import com.ruoyi.device.domain.api.IAircraftDomain;
-import com.ruoyi.device.domain.convert.AircraftDomainConvert;
+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 = AircraftDomainConvert.toEntity(aircraft);
+        AircraftEntity entity = AircraftConvert.to(aircraft);
         List<AircraftEntity> entityList = aircraftMapper.selectAircraftList(entity);
-        return AircraftDomainConvert.toModelList(entityList);
+        return AircraftConvert.fromList(entityList);
     }
 
     @Override
     public Aircraft selectAircraftByAircraftId(Long aircraftId)
     {
         AircraftEntity entity = aircraftMapper.selectAircraftByAircraftId(aircraftId);
-        return AircraftDomainConvert.toModel(entity);
+        return AircraftConvert.from(entity);
     }
 
     @Override
     public Aircraft selectAircraftByDeviceId(Long deviceId)
     {
         AircraftEntity entity = aircraftMapper.selectAircraftByDeviceId(deviceId);
-        return AircraftDomainConvert.toModel(entity);
+        return AircraftConvert.from(entity);
     }
 
     @Override
     public int insertAircraft(Aircraft aircraft)
     {
-        AircraftEntity entity = AircraftDomainConvert.toEntity(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 = AircraftDomainConvert.toEntity(aircraft);
+        AircraftEntity entity = AircraftConvert.to(aircraft);
         return aircraftMapper.updateAircraft(entity);
     }
 

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

@@ -1,7 +1,7 @@
 package com.ruoyi.device.domain.impl;
 
 import com.ruoyi.device.domain.api.IAircraftPayloadDomain;
-import com.ruoyi.device.domain.convert.AircraftPayloadDomainConvert;
+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 = AircraftPayloadDomainConvert.toEntity(aircraftPayload);
+        AircraftPayloadEntity entity = AircraftPayloadConvert.to(aircraftPayload);
         List<AircraftPayloadEntity> entityList = aircraftPayloadMapper.selectAircraftPayloadList(entity);
-        return AircraftPayloadDomainConvert.toModelList(entityList);
+        return AircraftPayloadConvert.fromList(entityList);
     }
 
     @Override
     public AircraftPayload selectAircraftPayloadById(Long id)
     {
         AircraftPayloadEntity entity = aircraftPayloadMapper.selectAircraftPayloadById(id);
-        return AircraftPayloadDomainConvert.toModel(entity);
+        return AircraftPayloadConvert.from(entity);
     }
 
     @Override
     public List<AircraftPayload> selectAircraftPayloadByAircraftId(Long aircraftId)
     {
         List<AircraftPayloadEntity> entityList = aircraftPayloadMapper.selectAircraftPayloadListByAircraftId(aircraftId);
-        return AircraftPayloadDomainConvert.toModelList(entityList);
+        return AircraftPayloadConvert.fromList(entityList);
     }
 
     @Override
     public List<AircraftPayload> selectAircraftPayloadByPayloadId(Long payloadId)
     {
         List<AircraftPayloadEntity> entityList = aircraftPayloadMapper.selectAircraftPayloadListByPayloadId(payloadId);
-        return AircraftPayloadDomainConvert.toModelList(entityList);
+        return AircraftPayloadConvert.fromList(entityList);
     }
 
     @Override
     public List<AircraftPayload> selectAircraftPayloadByDockId(Long dockId)
     {
         List<AircraftPayloadEntity> entityList = aircraftPayloadMapper.selectAircraftPayloadListByDockId(dockId);
-        return AircraftPayloadDomainConvert.toModelList(entityList);
+        return AircraftPayloadConvert.fromList(entityList);
     }
 
     @Override
     public int insertAircraftPayload(AircraftPayload aircraftPayload)
     {
-        AircraftPayloadEntity entity = AircraftPayloadDomainConvert.toEntity(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 = AircraftPayloadDomainConvert.toEntity(aircraftPayload);
+        AircraftPayloadEntity entity = AircraftPayloadConvert.to(aircraftPayload);
         return aircraftPayloadMapper.updateAircraftPayload(entity);
     }
 

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

@@ -1,7 +1,7 @@
 package com.ruoyi.device.domain.impl;
 
 import com.ruoyi.device.domain.api.IDeviceDomain;
-import com.ruoyi.device.domain.convert.DeviceDomainConvert;
+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 = DeviceDomainConvert.toEntity(device);
+        DeviceEntity entity = DeviceConvert.to(device);
         List<DeviceEntity> entityList = deviceMapper.selectDeviceList(entity);
-        return DeviceDomainConvert.toModelList(entityList);
+        return DeviceConvert.fromList(entityList);
     }
 
     @Override
     public Device selectDeviceByDeviceId(Long deviceId)
     {
         DeviceEntity entity = deviceMapper.selectDeviceByDeviceId(deviceId);
-        return DeviceDomainConvert.toModel(entity);
+        return DeviceConvert.from(entity);
     }
 
     @Override
     public Device selectDeviceByIotDeviceId(String iotDeviceId)
     {
         DeviceEntity entity = deviceMapper.selectDeviceByIotDeviceId(iotDeviceId);
-        return DeviceDomainConvert.toModel(entity);
+        return DeviceConvert.from(entity);
     }
 
     @Override
     public int insertDevice(Device device)
     {
-        DeviceEntity entity = DeviceDomainConvert.toEntity(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 = DeviceDomainConvert.toEntity(device);
+        DeviceEntity entity = DeviceConvert.to(device);
         return deviceMapper.updateDevice(entity);
     }
 

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

@@ -1,7 +1,7 @@
 package com.ruoyi.device.domain.impl;
 
 import com.ruoyi.device.domain.api.IDeviceTempDomain;
-import com.ruoyi.device.domain.convert.DeviceTempDomainConvert;
+import com.ruoyi.device.domain.convert.DeviceTempDomainEntityConvert;
 import com.ruoyi.device.domain.model.DeviceTemp;
 import com.ruoyi.device.mapper.DeviceTempMapper;
 import com.ruoyi.device.mapper.entity.DeviceTempEntity;
@@ -25,15 +25,15 @@ public class DeviceTempDomainImpl implements IDeviceTempDomain
     @Override
     public List<DeviceTemp> selectDeviceTempList(DeviceTemp deviceTempModel)
     {
-        DeviceTempEntity entity = DeviceTempDomainConvert.toEntity(deviceTempModel);
+        DeviceTempEntity entity = DeviceTempDomainEntityConvert.toEntity(deviceTempModel);
         List<DeviceTempEntity> entityList = deviceTempMapper.selectDeviceTempList(entity);
-        return DeviceTempDomainConvert.toModelList(entityList);
+        return DeviceTempDomainEntityConvert.toModelList(entityList);
     }
 
     @Override
     public DeviceTemp selectDeviceTempById(String id)
     {
         DeviceTempEntity entity = deviceTempMapper.selectDeviceTempById(id);
-        return DeviceTempDomainConvert.toModel(entity);
+        return DeviceTempDomainEntityConvert.toModel(entity);
     }
 }

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

@@ -1,7 +1,7 @@
 package com.ruoyi.device.domain.impl;
 
 import com.ruoyi.device.domain.api.IDockAircraftDomain;
-import com.ruoyi.device.domain.convert.DockAircraftDomainConvert;
+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 = DockAircraftDomainConvert.toEntity(dockAircraft);
+        DockAircraftEntity entity = DockAircraftConvert.to(dockAircraft);
         List<DockAircraftEntity> entityList = dockAircraftMapper.selectDockAircraftList(entity);
-        return DockAircraftDomainConvert.toModelList(entityList);
+        return DockAircraftConvert.fromList(entityList);
     }
 
     @Override
     public DockAircraft selectDockAircraftById(Long id)
     {
         DockAircraftEntity entity = dockAircraftMapper.selectDockAircraftById(id);
-        return DockAircraftDomainConvert.toModel(entity);
+        return DockAircraftConvert.from(entity);
     }
 
     @Override
     public List<DockAircraft> selectDockAircraftByDockId(Long dockId)
     {
         List<DockAircraftEntity> entityList = dockAircraftMapper.selectDockAircraftListByDockId(dockId);
-        return DockAircraftDomainConvert.toModelList(entityList);
+        return DockAircraftConvert.fromList(entityList);
     }
 
     @Override
     public List<DockAircraft> selectDockAircraftByAircraftId(Long aircraftId)
     {
         List<DockAircraftEntity> entityList = dockAircraftMapper.selectDockAircraftListByAircraftId(aircraftId);
-        return DockAircraftDomainConvert.toModelList(entityList);
+        return DockAircraftConvert.fromList(entityList);
     }
 
     @Override
     public int insertDockAircraft(DockAircraft dockAircraft)
     {
-        DockAircraftEntity entity = DockAircraftDomainConvert.toEntity(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 = DockAircraftDomainConvert.toEntity(dockAircraft);
+        DockAircraftEntity entity = DockAircraftConvert.to(dockAircraft);
         return dockAircraftMapper.updateDockAircraft(entity);
     }
 

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

@@ -1,7 +1,7 @@
 package com.ruoyi.device.domain.impl;
 
 import com.ruoyi.device.domain.api.IDockDomain;
-import com.ruoyi.device.domain.convert.DockDomainConvert;
+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 = DockDomainConvert.toEntity(dock);
+        DockEntity entity = DockConvert.to(dock);
         List<DockEntity> entityList = dockMapper.selectDockList(entity);
-        return DockDomainConvert.toModelList(entityList);
+        return DockConvert.fromList(entityList);
     }
 
     @Override
     public Dock selectDockByDockId(Long dockId)
     {
         DockEntity entity = dockMapper.selectDockByDockId(dockId);
-        return DockDomainConvert.toModel(entity);
+        return DockConvert.from(entity);
     }
 
     @Override
     public Dock selectDockByDeviceId(Long deviceId)
     {
         DockEntity entity = dockMapper.selectDockByDeviceId(deviceId);
-        return DockDomainConvert.toModel(entity);
+        return DockConvert.from(entity);
     }
 
     @Override
     public int insertDock(Dock dock)
     {
-        DockEntity entity = DockDomainConvert.toEntity(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 = DockDomainConvert.toEntity(dock);
+        DockEntity entity = DockConvert.to(dock);
         return dockMapper.updateDock(entity);
     }
 

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

@@ -1,7 +1,7 @@
 package com.ruoyi.device.domain.impl;
 
 import com.ruoyi.device.domain.api.IDockGroupDomain;
-import com.ruoyi.device.domain.convert.DockGroupDomainConvert;
+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 = DockGroupDomainConvert.toEntity(dockGroup);
+        DockGroupEntity entity = DockGroupConvert.to(dockGroup);
         List<DockGroupEntity> entityList = dockGroupMapper.selectDockGroupList(entity);
-        return DockGroupDomainConvert.toModelList(entityList);
+        return DockGroupConvert.fromList(entityList);
     }
 
     @Override
     public DockGroup selectDockGroupById(Long id)
     {
         DockGroupEntity entity = dockGroupMapper.selectDockGroupById(id);
-        return DockGroupDomainConvert.toModel(entity);
+        return DockGroupConvert.from(entity);
     }
 
     @Override
     public List<DockGroup> selectDockGroupByDockId(Long dockId)
     {
         List<DockGroupEntity> entityList = dockGroupMapper.selectDockGroupListByDockId(dockId);
-        return DockGroupDomainConvert.toModelList(entityList);
+        return DockGroupConvert.fromList(entityList);
     }
 
     @Override
     public List<DockGroup> selectDockGroupByGroupId(Long groupId)
     {
         List<DockGroupEntity> entityList = dockGroupMapper.selectDockGroupListByGroupId(groupId);
-        return DockGroupDomainConvert.toModelList(entityList);
+        return DockGroupConvert.fromList(entityList);
     }
 
     @Override
     public int insertDockGroup(DockGroup dockGroup)
     {
-        DockGroupEntity entity = DockGroupDomainConvert.toEntity(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 = DockGroupDomainConvert.toEntity(dockGroup);
+        DockGroupEntity entity = DockGroupConvert.to(dockGroup);
         return dockGroupMapper.updateDockGroup(entity);
     }
 

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

@@ -1,7 +1,7 @@
 package com.ruoyi.device.domain.impl;
 
 import com.ruoyi.device.domain.api.IGroupDomain;
-import com.ruoyi.device.domain.convert.GroupDomainConvert;
+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 = GroupDomainConvert.toEntity(group);
+        GroupEntity entity = GroupConvert.to(group);
         List<GroupEntity> entityList = groupMapper.selectGroupList(entity);
-        return GroupDomainConvert.toModelList(entityList);
+        return GroupConvert.fromList(entityList);
     }
 
     @Override
     public Group selectGroupByGroupId(Long groupId)
     {
         GroupEntity entity = groupMapper.selectGroupByGroupId(groupId);
-        return GroupDomainConvert.toModel(entity);
+        return GroupConvert.from(entity);
     }
 
     @Override
     public int insertGroup(Group group)
     {
-        GroupEntity entity = GroupDomainConvert.toEntity(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 = GroupDomainConvert.toEntity(group);
+        GroupEntity entity = GroupConvert.to(group);
         return groupMapper.updateGroup(entity);
     }
 

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

@@ -1,7 +1,7 @@
 package com.ruoyi.device.domain.impl;
 
 import com.ruoyi.device.domain.api.IPayloadDomain;
-import com.ruoyi.device.domain.convert.PayloadDomainConvert;
+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 = PayloadDomainConvert.toEntity(payload);
+        PayloadEntity entity = PayloadConvert.to(payload);
         List<PayloadEntity> entityList = payloadMapper.selectPayloadList(entity);
-        return PayloadDomainConvert.toModelList(entityList);
+        return PayloadConvert.fromList(entityList);
     }
 
     @Override
     public Payload selectPayloadByPayloadId(Long payloadId)
     {
         PayloadEntity entity = payloadMapper.selectPayloadByPayloadId(payloadId);
-        return PayloadDomainConvert.toModel(entity);
+        return PayloadConvert.from(entity);
     }
 
     @Override
     public int insertPayload(Payload payload)
     {
-        PayloadEntity entity = PayloadDomainConvert.toEntity(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 = PayloadDomainConvert.toEntity(payload);
+        PayloadEntity entity = PayloadConvert.to(payload);
         return payloadMapper.updatePayload(entity);
     }
 

src/main/java/com/ruoyi/device/service/api/IGroupService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.device.service.api;
 
 import com.ruoyi.device.api.domain.GroupVO;
+import com.ruoyi.device.service.dto.DockGroupDTO;
 import com.ruoyi.device.service.dto.GroupDTO;
 import com.ruoyi.device.service.dto.DockDTO;
 import java.util.List;
@@ -90,7 +91,7 @@ public interface IGroupService
      * @param groupId 分组ID
      * @return 机场列表
      */
-    List<DockDTO> getDocksByGroupId(Long groupId);
+    List<DockGroupDTO> getDocksByGroupId(Long groupId);
 
     /**
      * 查看所有分组

src/main/java/com/ruoyi/device/service/convert/AircraftDTOConvert.java

@@ -0,0 +1,57 @@
+package com.ruoyi.device.service.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.domain.model.Aircraft;
+import com.ruoyi.device.service.dto.AircraftDTO;
+
+import java.util.List;
+
+/**
+ * 无人机Service层转换器
+ * Service DTO ↔ Domain Model
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class AircraftDTOConvert extends BaseConvert<Aircraft, AircraftDTO>
+{
+
+    private static final AircraftDTOConvert INSTANCE = new AircraftDTOConvert();
+
+    private AircraftDTOConvert() {
+        super(Aircraft.class, AircraftDTO.class);
+    }
+
+    /**
+     * Model 转 DTO
+     */
+    public static AircraftDTO from(Aircraft model)
+    {
+        return INSTANCE.innerFrom(model);
+    }
+
+    /**
+     * DTO 转 Model
+     */
+    public static Aircraft to(AircraftDTO dto)
+    {
+        return INSTANCE.innerTo(dto);
+    }
+
+    /**
+     * Model List 转 DTO List
+     */
+    public static List<AircraftDTO> fromList(List<Aircraft> modelList)
+    {
+        return INSTANCE.innerFromList(modelList);
+    }
+
+    /**
+     * DTO List 转 Model List
+     */
+    public static List<Aircraft> toList(List<AircraftDTO> dtoList)
+    {
+        return INSTANCE.innerToList(dtoList);
+    }
+
+}

src/main/java/com/ruoyi/device/service/convert/AircraftPayloadDTOConvert.java

@@ -0,0 +1,57 @@
+package com.ruoyi.device.service.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.domain.model.AircraftPayload;
+import com.ruoyi.device.service.dto.AircraftPayloadDTO;
+
+import java.util.List;
+
+/**
+ * 无人机挂载关联Service层转换器
+ * Service DTO ↔ Domain Model
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class AircraftPayloadDTOConvert extends BaseConvert<AircraftPayload, AircraftPayloadDTO>
+{
+
+    private static final AircraftPayloadDTOConvert INSTANCE = new AircraftPayloadDTOConvert();
+
+    private AircraftPayloadDTOConvert() {
+        super(AircraftPayload.class, AircraftPayloadDTO.class);
+    }
+
+    /**
+     * Model 转 DTO
+     */
+    public static AircraftPayloadDTO from(AircraftPayload model)
+    {
+        return INSTANCE.innerFrom(model);
+    }
+
+    /**
+     * DTO 转 Model
+     */
+    public static AircraftPayload to(AircraftPayloadDTO dto)
+    {
+        return INSTANCE.innerTo(dto);
+    }
+
+    /**
+     * Model List 转 DTO List
+     */
+    public static List<AircraftPayloadDTO> fromList(List<AircraftPayload> modelList)
+    {
+        return INSTANCE.innerFromList(modelList);
+    }
+
+    /**
+     * DTO List 转 Model List
+     */
+    public static List<AircraftPayload> toList(List<AircraftPayloadDTO> dtoList)
+    {
+        return INSTANCE.innerToList(dtoList);
+    }
+
+}

src/main/java/com/ruoyi/device/service/convert/AircraftPayloadServiceConvert.java

@@ -1,58 +0,0 @@
-package com.ruoyi.device.service.convert;
-
-import com.ruoyi.device.domain.model.AircraftPayload;
-import com.ruoyi.device.service.dto.AircraftPayloadDTO;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 无人机挂载关联Service层转换器
- * Service DTO ↔ Domain Model
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class AircraftPayloadServiceConvert
-{
-    /**
-     * Model 转 DTO
-     */
-    public static AircraftPayloadDTO toDTO(AircraftPayload model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        AircraftPayloadDTO dto = new AircraftPayloadDTO();
-        BeanUtils.copyProperties(model, dto);
-        return dto;
-    }
-
-    /**
-     * DTO 转 Model
-     */
-    public static AircraftPayload toModel(AircraftPayloadDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-        AircraftPayload model = new AircraftPayload();
-        BeanUtils.copyProperties(dto, model);
-        return model;
-    }
-
-    /**
-     * Model List 转 DTO List
-     */
-    public static List<AircraftPayloadDTO> toDTOList(List<AircraftPayload> modelList)
-    {
-        if (modelList == null)
-        {
-            return null;
-        }
-        return modelList.stream().map(AircraftPayloadServiceConvert::toDTO).collect(Collectors.toList());
-    }
-}

src/main/java/com/ruoyi/device/service/convert/AircraftServiceConvert.java

@@ -1,58 +0,0 @@
-package com.ruoyi.device.service.convert;
-
-import com.ruoyi.device.domain.model.Aircraft;
-import com.ruoyi.device.service.dto.AircraftDTO;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 无人机Service层转换器
- * Service DTO ↔ Domain Model
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class AircraftServiceConvert
-{
-    /**
-     * Model 转 DTO
-     */
-    public static AircraftDTO toDTO(Aircraft model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        AircraftDTO dto = new AircraftDTO();
-        BeanUtils.copyProperties(model, dto);
-        return dto;
-    }
-
-    /**
-     * DTO 转 Model
-     */
-    public static Aircraft toModel(AircraftDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-        Aircraft model = new Aircraft();
-        BeanUtils.copyProperties(dto, model);
-        return model;
-    }
-
-    /**
-     * Model List 转 DTO List
-     */
-    public static List<AircraftDTO> toDTOList(List<Aircraft> modelList)
-    {
-        if (modelList == null)
-        {
-            return null;
-        }
-        return modelList.stream().map(AircraftServiceConvert::toDTO).collect(Collectors.toList());
-    }
-}

src/main/java/com/ruoyi/device/service/convert/BufferDeviceConvert.java

@@ -1,153 +0,0 @@
-package com.ruoyi.device.service.convert;
-
-import com.ruoyi.device.api.domain.AircraftDetailVO;
-import com.ruoyi.device.api.domain.DockDetailVO;
-import com.ruoyi.device.api.domain.NetworkVO;
-import com.ruoyi.device.api.domain.PayloadDetailVO;
-import com.ruoyi.device.api.domain.PayloadVO;
-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 java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 设备缓冲服务转换类
- * 用于 DTO 到 VO 的转换
- *
- * @author ruoyi
- * @date 2026-01-20
- */
-public class BufferDeviceConvert
-{
-    public static DockDetailVO toVO(DockDetailDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-
-        DockDetailVO vo = new DockDetailVO();
-
-        vo.setDockId(dto.getDockId());
-        vo.setDockName(dto.getDockName());
-        vo.setManufacturerName(dto.getManufacturerName());
-        vo.setFirmwareVersion(dto.getFirmwareVersion());
-        vo.setSnNumber(dto.getSnNumber());
-        vo.setBindTime(dto.getBindTime());
-        vo.setMaintenanceDays(dto.getMaintenanceDays());
-        vo.setDockName(dto.getDockName());
-        vo.setDockStatus(dto.getDockStatus());
-        vo.setBackupLongitude(dto.getBackupLongitude());
-        vo.setBackupLatitude(dto.getBackupLatitude());
-        vo.setRunningDuration(dto.getRunningDuration());
-        vo.setMissionCount(dto.getMissionCount());
-        vo.setWindSpeed(dto.getWindSpeed());
-        vo.setRainfall(dto.getRainfall());
-        vo.setEnvironmentTemperature(dto.getEnvironmentTemperature());
-        vo.setEnvironmentHumidity(dto.getEnvironmentHumidity());
-        vo.setNetworkType(dto.getNetworkType());
-        vo.setNetworkDelay(dto.getNetworkDelay());
-        vo.setAirConditionerStatus(dto.getAirConditionerStatus());
-        vo.setCabinDoorStatus(dto.getCabinDoorStatus());
-        vo.setDockRunStatus(dto.getDockRunStatus());
-        vo.setInternalCamera(dto.getInternalCamera());
-        vo.setExternalCamera(dto.getExternalCamera());
-        vo.setChargingStatus(dto.getChargingStatus());
-        vo.setCabinTemperature(dto.getCabinTemperature());
-        vo.setCabinHumidity(dto.getCabinHumidity());
-        vo.setElevatorPosition(dto.getElevatorPosition());
-        vo.setXAxisClampStatus(dto.getXAxisClampStatus());
-        vo.setYAxisClampStatus(dto.getYAxisClampStatus());
-
-        return vo;
-    }
-
-    public static AircraftDetailVO toVO(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.setNetworkList(convertNetworkList(dto.getNetworkList()));
-        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());
-        vo.setPayloadList(convertPayloadList(dto.getPayloadList()));
-
-        return vo;
-    }
-
-    private static List<NetworkVO> convertNetworkList(List<NetworkDTO> networkDTOList)
-    {
-        if (networkDTOList == null)
-        {
-            return null;
-        }
-
-        return networkDTOList.stream()
-                .map(BufferDeviceConvert::toVO)
-                .collect(Collectors.toList());
-    }
-
-    private static NetworkVO toVO(NetworkDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-
-        NetworkVO vo = new NetworkVO();
-        vo.setNetworkType(dto.getNetworkType());
-        vo.setNetworkDelay(dto.getNetworkDelay());
-
-        return vo;
-    }
-
-    private static List<PayloadDetailVO> convertPayloadList(List<PayloadDTO> payloadDTOList)
-    {
-        if (payloadDTOList == null)
-        {
-            return null;
-        }
-
-        return payloadDTOList.stream()
-                .map(BufferDeviceConvert::toPayloadDetailVO)
-                .collect(Collectors.toList());
-    }
-
-    private static PayloadDetailVO toPayloadDetailVO(PayloadDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-
-        PayloadDetailVO vo = new PayloadDetailVO();
-        vo.setPayloadType(dto.getPayloadType());
-        vo.setPayloadModel(dto.getPayloadType());
-        vo.setFirmwareVersion(dto.getPayloadType());
-
-        return vo;
-    }
-}

src/main/java/com/ruoyi/device/service/convert/DeviceDTOConvert.java

@@ -0,0 +1,57 @@
+package com.ruoyi.device.service.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.domain.model.Device;
+import com.ruoyi.device.service.dto.DeviceDTO;
+
+import java.util.List;
+
+/**
+ * 设备Service层转换器
+ * Service DTO ↔ Domain Model
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class DeviceDTOConvert extends BaseConvert<Device, DeviceDTO>
+{
+
+    private static final DeviceDTOConvert INSTANCE = new DeviceDTOConvert();
+
+    private DeviceDTOConvert() {
+        super(Device.class, DeviceDTO.class);
+    }
+
+    /**
+     * Model 转 DTO
+     */
+    public static DeviceDTO from(Device model)
+    {
+        return INSTANCE.innerFrom(model);
+    }
+
+    /**
+     * DTO 转 Model
+     */
+    public static Device to(DeviceDTO dto)
+    {
+        return INSTANCE.innerTo(dto);
+    }
+
+    /**
+     * Model List 转 DTO List
+     */
+    public static List<DeviceDTO> fromList(List<Device> modelList)
+    {
+        return INSTANCE.innerFromList(modelList);
+    }
+
+    /**
+     * DTO List 转 Model List
+     */
+    public static List<Device> toList(List<DeviceDTO> dtoList)
+    {
+        return INSTANCE.innerToList(dtoList);
+    }
+
+}

src/main/java/com/ruoyi/device/service/convert/DeviceServiceConvert.java

@@ -1,58 +0,0 @@
-package com.ruoyi.device.service.convert;
-
-import com.ruoyi.device.domain.model.Device;
-import com.ruoyi.device.service.dto.DeviceDTO;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 设备Service层转换器
- * Service DTO ↔ Domain Model
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class DeviceServiceConvert
-{
-    /**
-     * Model 转 DTO
-     */
-    public static DeviceDTO toDTO(Device model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        DeviceDTO dto = new DeviceDTO();
-        BeanUtils.copyProperties(model, dto);
-        return dto;
-    }
-
-    /**
-     * DTO 转 Model
-     */
-    public static Device toModel(DeviceDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-        Device model = new Device();
-        BeanUtils.copyProperties(dto, model);
-        return model;
-    }
-
-    /**
-     * Model List 转 DTO List
-     */
-    public static List<DeviceDTO> toDTOList(List<Device> modelList)
-    {
-        if (modelList == null)
-        {
-            return null;
-        }
-        return modelList.stream().map(DeviceServiceConvert::toDTO).collect(Collectors.toList());
-    }
-}

src/main/java/com/ruoyi/device/service/convert/DeviceTempDTOConvert.java

@@ -0,0 +1,57 @@
+package com.ruoyi.device.service.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.domain.model.DeviceTemp;
+import com.ruoyi.device.service.dto.DeviceTempDTO;
+
+import java.util.List;
+
+/**
+ * 设备临时表Service层转换器
+ * Service DTO ↔ Domain Model
+ *
+ * @author ruoyi
+ * @date 2026-01-15
+ */
+public class DeviceTempDTOConvert extends BaseConvert<DeviceTemp, DeviceTempDTO>
+{
+
+    private static final DeviceTempDTOConvert INSTANCE = new DeviceTempDTOConvert();
+
+    private DeviceTempDTOConvert() {
+        super(DeviceTemp.class, DeviceTempDTO.class);
+    }
+
+    /**
+     * Model 转 DTO
+     */
+    public static DeviceTempDTO from(DeviceTemp model)
+    {
+        return INSTANCE.innerFrom(model);
+    }
+
+    /**
+     * DTO 转 Model
+     */
+    public static DeviceTemp to(DeviceTempDTO dto)
+    {
+        return INSTANCE.innerTo(dto);
+    }
+
+    /**
+     * Model List 转 DTO List
+     */
+    public static List<DeviceTempDTO> fromList(List<DeviceTemp> modelList)
+    {
+        return INSTANCE.innerFromList(modelList);
+    }
+
+    /**
+     * DTO List 转 Model List
+     */
+    public static List<DeviceTemp> toList(List<DeviceTempDTO> dtoList)
+    {
+        return INSTANCE.innerToList(dtoList);
+    }
+
+}

src/main/java/com/ruoyi/device/service/convert/DeviceTempServiceConvert.java

@@ -1,58 +0,0 @@
-package com.ruoyi.device.service.convert;
-
-import com.ruoyi.device.domain.model.DeviceTemp;
-import com.ruoyi.device.service.dto.DeviceTempDTO;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 设备临时表Service层转换器
- * Service DTO ↔ Domain Model
- *
- * @author ruoyi
- * @date 2026-01-15
- */
-public class DeviceTempServiceConvert
-{
-    /**
-     * Model 转 DTO
-     */
-    public static DeviceTempDTO toDTO(DeviceTemp model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        DeviceTempDTO dto = new DeviceTempDTO();
-        BeanUtils.copyProperties(model, dto);
-        return dto;
-    }
-
-    /**
-     * DTO 转 Model
-     */
-    public static DeviceTemp toModel(DeviceTempDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-        DeviceTemp model = new DeviceTemp();
-        BeanUtils.copyProperties(dto, model);
-        return model;
-    }
-
-    /**
-     * Model List 转 DTO List
-     */
-    public static List<DeviceTempDTO> toDTOList(List<DeviceTemp> modelList)
-    {
-        if (modelList == null)
-        {
-            return null;
-        }
-        return modelList.stream().map(DeviceTempServiceConvert::toDTO).collect(Collectors.toList());
-    }
-}

src/main/java/com/ruoyi/device/service/convert/DockAircraftDTOConvert.java

@@ -0,0 +1,57 @@
+package com.ruoyi.device.service.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.domain.model.DockAircraft;
+import com.ruoyi.device.service.dto.DockAircraftDTO;
+
+import java.util.List;
+
+/**
+ * 机场无人机关联Service层转换器
+ * Service DTO ↔ Domain Model
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class DockAircraftDTOConvert extends BaseConvert<DockAircraft, DockAircraftDTO>
+{
+
+    private static final DockAircraftDTOConvert INSTANCE = new DockAircraftDTOConvert();
+
+    private DockAircraftDTOConvert() {
+        super(DockAircraft.class, DockAircraftDTO.class);
+    }
+
+    /**
+     * Model 转 DTO
+     */
+    public static DockAircraftDTO from(DockAircraft model)
+    {
+        return INSTANCE.innerFrom(model);
+    }
+
+    /**
+     * DTO 转 Model
+     */
+    public static DockAircraft to(DockAircraftDTO dto)
+    {
+        return INSTANCE.innerTo(dto);
+    }
+
+    /**
+     * Model List 转 DTO List
+     */
+    public static List<DockAircraftDTO> fromList(List<DockAircraft> modelList)
+    {
+        return INSTANCE.innerFromList(modelList);
+    }
+
+    /**
+     * DTO List 转 Model List
+     */
+    public static List<DockAircraft> toList(List<DockAircraftDTO> dtoList)
+    {
+        return INSTANCE.innerToList(dtoList);
+    }
+
+}

src/main/java/com/ruoyi/device/service/convert/DockAircraftServiceConvert.java

@@ -1,58 +0,0 @@
-package com.ruoyi.device.service.convert;
-
-import com.ruoyi.device.domain.model.DockAircraft;
-import com.ruoyi.device.service.dto.DockAircraftDTO;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 机场无人机关联Service层转换器
- * Service DTO ↔ Domain Model
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class DockAircraftServiceConvert
-{
-    /**
-     * Model 转 DTO
-     */
-    public static DockAircraftDTO toDTO(DockAircraft model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        DockAircraftDTO dto = new DockAircraftDTO();
-        BeanUtils.copyProperties(model, dto);
-        return dto;
-    }
-
-    /**
-     * DTO 转 Model
-     */
-    public static DockAircraft toModel(DockAircraftDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-        DockAircraft model = new DockAircraft();
-        BeanUtils.copyProperties(dto, model);
-        return model;
-    }
-
-    /**
-     * Model List 转 DTO List
-     */
-    public static List<DockAircraftDTO> toDTOList(List<DockAircraft> modelList)
-    {
-        if (modelList == null)
-        {
-            return null;
-        }
-        return modelList.stream().map(DockAircraftServiceConvert::toDTO).collect(Collectors.toList());
-    }
-}

src/main/java/com/ruoyi/device/service/convert/DockDTOConvert.java

@@ -0,0 +1,57 @@
+package com.ruoyi.device.service.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.domain.model.Dock;
+import com.ruoyi.device.service.dto.DockDTO;
+
+import java.util.List;
+
+/**
+ * 机场Service层转换器
+ * Service DTO ↔ Domain Model
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class DockDTOConvert extends BaseConvert<Dock, DockDTO>
+{
+
+    private static final DockDTOConvert INSTANCE = new DockDTOConvert();
+
+    private DockDTOConvert() {
+        super(Dock.class, DockDTO.class);
+    }
+
+    /**
+     * Model 转 DTO
+     */
+    public static DockDTO from(Dock model)
+    {
+        return INSTANCE.innerFrom(model);
+    }
+
+    /**
+     * DTO 转 Model
+     */
+    public static Dock to(DockDTO dto)
+    {
+        return INSTANCE.innerTo(dto);
+    }
+
+    /**
+     * Model List 转 DTO List
+     */
+    public static List<DockDTO> fromList(List<Dock> modelList)
+    {
+        return INSTANCE.innerFromList(modelList);
+    }
+
+    /**
+     * DTO List 转 Model List
+     */
+    public static List<Dock> toList(List<DockDTO> dtoList)
+    {
+        return INSTANCE.innerToList(dtoList);
+    }
+
+}

src/main/java/com/ruoyi/device/service/convert/DockGroupDTOConvert.java

@@ -0,0 +1,57 @@
+package com.ruoyi.device.service.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.domain.model.DockGroup;
+import com.ruoyi.device.service.dto.DockGroupDTO;
+
+import java.util.List;
+
+/**
+ * 机场分组关联Service层转换器
+ * Service DTO ↔ Domain Model
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class DockGroupDTOConvert extends BaseConvert<DockGroup, DockGroupDTO>
+{
+
+    private static final DockGroupDTOConvert INSTANCE = new DockGroupDTOConvert();
+
+    private DockGroupDTOConvert() {
+        super(DockGroup.class, DockGroupDTO.class);
+    }
+
+    /**
+     * Model 转 DTO
+     */
+    public static DockGroupDTO from(DockGroup model)
+    {
+        return INSTANCE.innerFrom(model);
+    }
+
+    /**
+     * DTO 转 Model
+     */
+    public static DockGroup to(DockGroupDTO dto)
+    {
+        return INSTANCE.innerTo(dto);
+    }
+
+    /**
+     * Model List 转 DTO List
+     */
+    public static List<DockGroupDTO> fromList(List<DockGroup> modelList)
+    {
+        return INSTANCE.innerFromList(modelList);
+    }
+
+    /**
+     * DTO List 转 Model List
+     */
+    public static List<DockGroup> toList(List<DockGroupDTO> dtoList)
+    {
+        return INSTANCE.innerToList(dtoList);
+    }
+
+}

src/main/java/com/ruoyi/device/service/convert/DockGroupServiceConvert.java

@@ -1,58 +0,0 @@
-package com.ruoyi.device.service.convert;
-
-import com.ruoyi.device.domain.model.DockGroup;
-import com.ruoyi.device.service.dto.DockGroupDTO;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 机场分组关联Service层转换器
- * Service DTO ↔ Domain Model
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class DockGroupServiceConvert
-{
-    /**
-     * Model 转 DTO
-     */
-    public static DockGroupDTO toDTO(DockGroup model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        DockGroupDTO dto = new DockGroupDTO();
-        BeanUtils.copyProperties(model, dto);
-        return dto;
-    }
-
-    /**
-     * DTO 转 Model
-     */
-    public static DockGroup toModel(DockGroupDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-        DockGroup model = new DockGroup();
-        BeanUtils.copyProperties(dto, model);
-        return model;
-    }
-
-    /**
-     * Model List 转 DTO List
-     */
-    public static List<DockGroupDTO> toDTOList(List<DockGroup> modelList)
-    {
-        if (modelList == null)
-        {
-            return null;
-        }
-        return modelList.stream().map(DockGroupServiceConvert::toDTO).collect(Collectors.toList());
-    }
-}

src/main/java/com/ruoyi/device/service/convert/DockServiceConvert.java

@@ -1,58 +0,0 @@
-package com.ruoyi.device.service.convert;
-
-import com.ruoyi.device.domain.model.Dock;
-import com.ruoyi.device.service.dto.DockDTO;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 机场Service层转换器
- * Service DTO ↔ Domain Model
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class DockServiceConvert
-{
-    /**
-     * Model 转 DTO
-     */
-    public static DockDTO toDTO(Dock model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        DockDTO dto = new DockDTO();
-        BeanUtils.copyProperties(model, dto);
-        return dto;
-    }
-
-    /**
-     * DTO 转 Model
-     */
-    public static Dock toModel(DockDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-        Dock model = new Dock();
-        BeanUtils.copyProperties(dto, model);
-        return model;
-    }
-
-    /**
-     * Model List 转 DTO List
-     */
-    public static List<DockDTO> toDTOList(List<Dock> modelList)
-    {
-        if (modelList == null)
-        {
-            return null;
-        }
-        return modelList.stream().map(DockServiceConvert::toDTO).collect(Collectors.toList());
-    }
-}

src/main/java/com/ruoyi/device/service/convert/GroupDTOConvert.java

@@ -0,0 +1,57 @@
+package com.ruoyi.device.service.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.domain.model.Group;
+import com.ruoyi.device.service.dto.GroupDTO;
+
+import java.util.List;
+
+/**
+ * 分组Service层转换器
+ * Service DTO ↔ Domain Model
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class GroupDTOConvert extends BaseConvert<Group, GroupDTO>
+{
+
+    private static final GroupDTOConvert INSTANCE = new GroupDTOConvert();
+
+    private GroupDTOConvert() {
+        super(Group.class, GroupDTO.class);
+    }
+
+    /**
+     * Model 转 DTO
+     */
+    public static GroupDTO from(Group model)
+    {
+        return INSTANCE.innerFrom(model);
+    }
+
+    /**
+     * DTO 转 Model
+     */
+    public static Group to(GroupDTO dto)
+    {
+        return INSTANCE.innerTo(dto);
+    }
+
+    /**
+     * Model List 转 DTO List
+     */
+    public static List<GroupDTO> fromList(List<Group> modelList)
+    {
+        return INSTANCE.innerFromList(modelList);
+    }
+
+    /**
+     * DTO List 转 Model List
+     */
+    public static List<Group> toList(List<GroupDTO> dtoList)
+    {
+        return INSTANCE.innerToList(dtoList);
+    }
+
+}

src/main/java/com/ruoyi/device/service/convert/GroupServiceConvert.java

@@ -1,58 +0,0 @@
-package com.ruoyi.device.service.convert;
-
-import com.ruoyi.device.domain.model.Group;
-import com.ruoyi.device.service.dto.GroupDTO;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 分组Service层转换器
- * Service DTO ↔ Domain Model
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class GroupServiceConvert
-{
-    /**
-     * Model 转 DTO
-     */
-    public static GroupDTO toDTO(Group model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        GroupDTO dto = new GroupDTO();
-        BeanUtils.copyProperties(model, dto);
-        return dto;
-    }
-
-    /**
-     * DTO 转 Model
-     */
-    public static Group toModel(GroupDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-        Group model = new Group();
-        BeanUtils.copyProperties(dto, model);
-        return model;
-    }
-
-    /**
-     * Model List 转 DTO List
-     */
-    public static List<GroupDTO> toDTOList(List<Group> modelList)
-    {
-        if (modelList == null)
-        {
-            return null;
-        }
-        return modelList.stream().map(GroupServiceConvert::toDTO).collect(Collectors.toList());
-    }
-}

src/main/java/com/ruoyi/device/service/convert/PayloadDTOConvert.java

@@ -0,0 +1,57 @@
+package com.ruoyi.device.service.convert;
+
+import com.ruoyi.common.core.utils.BaseConvert;
+import com.ruoyi.device.domain.model.Payload;
+import com.ruoyi.device.service.dto.PayloadDTO;
+
+import java.util.List;
+
+/**
+ * 挂载Service层转换器
+ * Service DTO ↔ Domain Model
+ *
+ * @author ruoyi
+ * @date 2026-01-16
+ */
+public class PayloadDTOConvert extends BaseConvert<Payload, PayloadDTO>
+{
+
+    private static final PayloadDTOConvert INSTANCE = new PayloadDTOConvert();
+
+    private PayloadDTOConvert() {
+        super(Payload.class, PayloadDTO.class);
+    }
+
+    /**
+     * Model 转 DTO
+     */
+    public static PayloadDTO from(Payload model)
+    {
+        return INSTANCE.innerFrom(model);
+    }
+
+    /**
+     * DTO 转 Model
+     */
+    public static Payload to(PayloadDTO dto)
+    {
+        return INSTANCE.innerTo(dto);
+    }
+
+    /**
+     * Model List 转 DTO List
+     */
+    public static List<PayloadDTO> fromList(List<Payload> modelList)
+    {
+        return INSTANCE.innerFromList(modelList);
+    }
+
+    /**
+     * DTO List 转 Model List
+     */
+    public static List<Payload> toList(List<PayloadDTO> dtoList)
+    {
+        return INSTANCE.innerToList(dtoList);
+    }
+
+}

src/main/java/com/ruoyi/device/service/convert/PayloadServiceConvert.java

@@ -1,58 +0,0 @@
-package com.ruoyi.device.service.convert;
-
-import com.ruoyi.device.domain.model.Payload;
-import com.ruoyi.device.service.dto.PayloadDTO;
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 挂载Service层转换器
- * Service DTO ↔ Domain Model
- *
- * @author ruoyi
- * @date 2026-01-16
- */
-public class PayloadServiceConvert
-{
-    /**
-     * Model 转 DTO
-     */
-    public static PayloadDTO toDTO(Payload model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        PayloadDTO dto = new PayloadDTO();
-        BeanUtils.copyProperties(model, dto);
-        return dto;
-    }
-
-    /**
-     * DTO 转 Model
-     */
-    public static Payload toModel(PayloadDTO dto)
-    {
-        if (dto == null)
-        {
-            return null;
-        }
-        Payload model = new Payload();
-        BeanUtils.copyProperties(dto, model);
-        return model;
-    }
-
-    /**
-     * Model List 转 DTO List
-     */
-    public static List<PayloadDTO> toDTOList(List<Payload> modelList)
-    {
-        if (modelList == null)
-        {
-            return null;
-        }
-        return modelList.stream().map(PayloadServiceConvert::toDTO).collect(Collectors.toList());
-    }
-}

src/main/java/com/ruoyi/device/service/impl/AircraftPayloadServiceImpl.java

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

src/main/java/com/ruoyi/device/service/impl/AircraftServiceImpl.java

@@ -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.toModel(aircraftDTO);
+        Aircraft model = AircraftDTOConvert.to(aircraftDTO);
         List<Aircraft> modelList = aircraftDomain.selectAircraftList(model);
-        return AircraftServiceConvert.toDTOList(modelList);
+        return AircraftDTOConvert.fromList(modelList);
     }
 
     @Override
     public AircraftDTO selectAircraftByAircraftId(Long aircraftId)
     {
         Aircraft model = aircraftDomain.selectAircraftByAircraftId(aircraftId);
-        return AircraftServiceConvert.toDTO(model);
+        return AircraftDTOConvert.from(model);
     }
 
     @Override

src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java

@@ -1,8 +1,11 @@
 package com.ruoyi.device.service.impl;
 
+import com.alibaba.fastjson2.JSON;
+import com.ruoyi.device.domain.api.IDeviceDomain;
 import com.ruoyi.device.domain.api.IDockDomain;
 import com.ruoyi.device.domain.api.IAircraftDomain;
 import com.ruoyi.device.domain.api.IThingsBoardDomain;
+import com.ruoyi.device.domain.model.Device;
 import com.ruoyi.device.domain.model.Dock;
 import com.ruoyi.device.domain.model.Aircraft;
 import com.ruoyi.device.domain.model.thingsboard.AttributeMap;
@@ -14,17 +17,15 @@ 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.dto.AircraftDTO;
-import com.ruoyi.device.service.dto.DockDTO;
 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.DockServiceConvert;
-import com.ruoyi.device.service.convert.AircraftServiceConvert;
+import com.ruoyi.device.service.convert.AircraftDTOConvert;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -36,11 +37,15 @@ import java.util.stream.Collectors;
  * @date 2026-01-20
  */
 @Service
+@Slf4j
 public class BufferDeviceImpl implements IBufferDeviceService
 {
     @Autowired
     private IDockDomain dockDomain;
 
+    @Autowired
+    private IDeviceDomain deviceDomain;
+
     @Autowired
     private IAircraftDomain aircraftDomain;
 
@@ -55,47 +60,42 @@ public class BufferDeviceImpl implements IBufferDeviceService
         {
             return null;
         }
-
-        DockDTO dockDTO = DockServiceConvert.toDTO(dock);
+        Device device = deviceDomain.selectDeviceByDeviceId(dock.getDeviceId());
 
         DockDetailDTO result = new DockDetailDTO();
+        result.setDockId(dock.getDockId());
+        result.setDockName(dock.getDockName());
+        result.setDockLocation(dock.getDockLocation());
 
-        result.setDockId(dockDTO.getDockId());
-        result.setDockName(dockDTO.getDockName());
-        result.setDockLocation(dockDTO.getDockLocation());
+        ThingsBoardData thingsBoardData = getThingsBoardData("dock", device.getIotDeviceId());
 
-        ThingsBoardData thingsBoardData = getThingsBoardData("dock", null);
-
-        if (thingsBoardData != null)
-        {
-            result.setFirmwareVersion(thingsBoardData.getFirmwareVersion());
-            result.setSnNumber(thingsBoardData.getSnNumber());
-            result.setBindTime(thingsBoardData.getBindTime());
-            result.setMaintenanceDays(thingsBoardData.getMaintenanceDays());
-            result.setDockName(thingsBoardData.getDockName());
-            result.setDockStatus(thingsBoardData.getDockStatus());
-            result.setBackupLongitude(thingsBoardData.getBackupLongitude());
-            result.setBackupLatitude(thingsBoardData.getBackupLatitude());
-            result.setRunningDuration(thingsBoardData.getRunningDuration());
-            result.setMissionCount(thingsBoardData.getMissionCount());
-            result.setWindSpeed(thingsBoardData.getWindSpeed());
-            result.setRainfall(thingsBoardData.getRainfall());
-            result.setEnvironmentTemperature(thingsBoardData.getEnvironmentTemperature());
-            result.setEnvironmentHumidity(thingsBoardData.getEnvironmentHumidity());
-            result.setNetworkType(thingsBoardData.getNetworkType());
-            result.setNetworkDelay(thingsBoardData.getNetworkDelay());
-            result.setAirConditionerStatus(thingsBoardData.getAirConditionerStatus());
-            result.setCabinDoorStatus(thingsBoardData.getCabinDoorStatus());
-            result.setDockRunStatus(thingsBoardData.getDockRunStatus());
-            result.setInternalCamera(thingsBoardData.getInternalCamera());
-            result.setExternalCamera(thingsBoardData.getExternalCamera());
-            result.setChargingStatus(thingsBoardData.getChargingStatus());
-            result.setCabinTemperature(thingsBoardData.getCabinTemperature());
-            result.setCabinHumidity(thingsBoardData.getCabinHumidity());
-            result.setElevatorPosition(thingsBoardData.getElevatorPosition());
-            result.setXAxisClampStatus(thingsBoardData.getXAxisClampStatus());
-            result.setYAxisClampStatus(thingsBoardData.getYAxisClampStatus());
-        }
+        result.setFirmwareVersion(thingsBoardData.getFirmwareVersion());
+        result.setSnNumber(thingsBoardData.getSnNumber());
+        result.setBindTime(thingsBoardData.getBindTime());
+        result.setMaintenanceDays(thingsBoardData.getMaintenanceDays());
+        result.setDockName(thingsBoardData.getDockName());
+        result.setDockStatus(thingsBoardData.getDockStatus());
+        result.setBackupLongitude(thingsBoardData.getBackupLongitude());
+        result.setBackupLatitude(thingsBoardData.getBackupLatitude());
+        result.setRunningDuration(thingsBoardData.getRunningDuration());
+        result.setMissionCount(thingsBoardData.getMissionCount());
+        result.setWindSpeed(thingsBoardData.getWindSpeed());
+        result.setRainfall(thingsBoardData.getRainfall());
+        result.setEnvironmentTemperature(thingsBoardData.getEnvironmentTemperature());
+        result.setEnvironmentHumidity(thingsBoardData.getEnvironmentHumidity());
+        result.setNetworkType(thingsBoardData.getNetworkType());
+        result.setNetworkDelay(thingsBoardData.getNetworkDelay());
+        result.setAirConditionerStatus(thingsBoardData.getAirConditionerStatus());
+        result.setCabinDoorStatus(thingsBoardData.getCabinDoorStatus());
+        result.setDockRunStatus(thingsBoardData.getDockRunStatus());
+        result.setInternalCamera(thingsBoardData.getInternalCamera());
+        result.setExternalCamera(thingsBoardData.getExternalCamera());
+        result.setChargingStatus(thingsBoardData.getChargingStatus());
+        result.setCabinTemperature(thingsBoardData.getCabinTemperature());
+        result.setCabinHumidity(thingsBoardData.getCabinHumidity());
+        result.setElevatorPosition(thingsBoardData.getElevatorPosition());
+        result.setXAxisClampStatus(thingsBoardData.getXAxisClampStatus());
+        result.setYAxisClampStatus(thingsBoardData.getYAxisClampStatus());
 
         return result;
     }
@@ -109,7 +109,7 @@ public class BufferDeviceImpl implements IBufferDeviceService
             return null;
         }
 
-        AircraftDTO aircraftDTO = AircraftServiceConvert.toDTO(aircraft);
+        AircraftDTO aircraftDTO = AircraftDTOConvert.from(aircraft);
 
         AircraftDetailDTO result = new AircraftDetailDTO();
 
@@ -208,6 +208,9 @@ public class BufferDeviceImpl implements IBufferDeviceService
             }
         }
 
+        
+        log.info("getThingsBoardData {}", JSON.toJSONString(data));
+
         return data;
     }
 

src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java

@@ -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.toModel(deviceDTO);
+        Device model = DeviceDTOConvert.to(deviceDTO);
         List<Device> modelList = deviceDomain.selectDeviceList(model);
-        return DeviceServiceConvert.toDTOList(modelList);
+        return DeviceDTOConvert.fromList(modelList);
     }
 
     @Override
     public DeviceDTO selectDeviceByDeviceId(Long deviceId)
     {
         Device model = deviceDomain.selectDeviceByDeviceId(deviceId);
-        return DeviceServiceConvert.toDTO(model);
+        return DeviceDTOConvert.from(model);
     }
 
 

src/main/java/com/ruoyi/device/service/impl/DeviceTempServiceImpl.java

@@ -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.toModel(deviceTempDTO);
+        DeviceTemp model = DeviceTempDTOConvert.to(deviceTempDTO);
         List<DeviceTemp> modelList = deviceTempDomain.selectDeviceTempList(model);
-        return DeviceTempServiceConvert.toDTOList(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.toDTO(model);
+        return DeviceTempDTOConvert.from(model);
     }
 }

src/main/java/com/ruoyi/device/service/impl/DockAircraftServiceImpl.java

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

src/main/java/com/ruoyi/device/service/impl/DockGroupServiceImpl.java

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

src/main/java/com/ruoyi/device/service/impl/DockServiceImpl.java

@@ -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.toModel(dockDTO);
+        Dock model = DockDTOConvert.to(dockDTO);
         List<Dock> modelList = dockDomain.selectDockList(model);
-        return DockServiceConvert.toDTOList(modelList);
+        return DockDTOConvert.fromList(modelList);
     }
 
     @Override
     public DockDTO selectDockByDockId(Long dockId)
     {
         Dock model = dockDomain.selectDockByDockId(dockId);
-        return DockServiceConvert.toDTO(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.toModel(query));
-        return DockServiceConvert.toDTOList(modelList);
+        List<Dock> modelList = dockDomain.selectDockList(DockDTOConvert.to(query));
+        return DockDTOConvert.fromList(modelList);
     }
 }

src/main/java/com/ruoyi/device/service/impl/GroupServiceImpl.java

@@ -1,26 +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.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.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 
 /**
@@ -45,29 +41,29 @@ public class GroupServiceImpl implements IGroupService
     @Override
     public List<GroupDTO> selectGroupList(GroupDTO groupDTO)
     {
-        Group model = GroupServiceConvert.toModel(groupDTO);
+        Group model = GroupDTOConvert.to(groupDTO);
         List<Group> modelList = groupDomain.selectGroupList(model);
-        return GroupServiceConvert.toDTOList(modelList);
+        return GroupDTOConvert.fromList(modelList);
     }
 
     @Override
     public GroupDTO selectGroupByGroupId(Long groupId)
     {
         Group model = groupDomain.selectGroupByGroupId(groupId);
-        return GroupServiceConvert.toDTO(model);
+        return GroupDTOConvert.from(model);
     }
 
     @Override
     public int insertGroup(GroupDTO groupDTO)
     {
-        Group model = GroupServiceConvert.toModel(groupDTO);
+        Group model = GroupDTOConvert.to(groupDTO);
         return groupDomain.insertGroup(model);
     }
 
     @Override
     public int updateGroup(GroupDTO groupDTO)
     {
-        Group model = GroupServiceConvert.toModel(groupDTO);
+        Group model = GroupDTOConvert.to(groupDTO);
         return groupDomain.updateGroup(model);
     }
 
@@ -86,7 +82,7 @@ public class GroupServiceImpl implements IGroupService
     @Override
     public Long createGroup(GroupDTO groupDTO)
     {
-        Group model = GroupServiceConvert.toModel(groupDTO);
+        Group model = GroupDTOConvert.to(groupDTO);
         groupDomain.insertGroup(model);
         return model.getGroupId();
     }
@@ -117,7 +113,7 @@ public class GroupServiceImpl implements IGroupService
     }
 
     @Override
-    public List<DockDTO> getDocksByGroupId(Long groupId)
+    public List<DockGroupDTO> getDocksByGroupId(Long groupId)
     {
         DockGroup dockGroupQuery = new DockGroup();
         dockGroupQuery.setGroupId(groupId);
@@ -127,12 +123,8 @@ public class GroupServiceImpl implements IGroupService
         {
             return List.of();
         }
+        return DockGroupDTOConvert.fromList(dockGroupList);
 
-        return dockGroupList.stream()
-                .map(DockGroup::getDockId)
-                .map(dockDomain::selectDockByDockId)
-                .map(DockServiceConvert::toDTO)
-                .collect(Collectors.toList());
     }
 
     @Override

src/main/java/com/ruoyi/device/service/impl/PayloadServiceImpl.java

@@ -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.toModel(payloadDTO);
+        Payload model = PayloadDTOConvert.to(payloadDTO);
         List<Payload> modelList = payloadDomain.selectPayloadList(model);
-        return PayloadServiceConvert.toDTOList(modelList);
+        return PayloadDTOConvert.fromList(modelList);
     }
 
     @Override
     public PayloadDTO selectPayloadByPayloadId(Long payloadId)
     {
         Payload model = payloadDomain.selectPayloadByPayloadId(payloadId);
-        return PayloadServiceConvert.toDTO(model);
+        return PayloadDTOConvert.from(model);
     }
 }