diff --git a/src/main/java/com/ruoyi/device/controller/AirTypeGeneralEnumController.java b/src/main/java/com/ruoyi/device/controller/DeviceAirTypeGeneralEnumController.java
similarity index 82%
rename from src/main/java/com/ruoyi/device/controller/AirTypeGeneralEnumController.java
rename to src/main/java/com/ruoyi/device/controller/DeviceAirTypeGeneralEnumController.java
index ff57416..9a1545d 100644
--- a/src/main/java/com/ruoyi/device/controller/AirTypeGeneralEnumController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceAirTypeGeneralEnumController.java
@@ -5,24 +5,18 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.device.api.domain.AirTypeGeneralEnumVO;
 import com.ruoyi.device.api.domain.AirTypeVendorGroupVO;
-import com.ruoyi.device.api.domain.DockVO;
-import com.ruoyi.device.controller.convert.AirTypeGeneralEnumVOConvert;
-import com.ruoyi.device.controller.convert.DockVOConvert;
+import com.ruoyi.device.controller.convert.DeviceAirTypeGeneralEnumVOConvert;
 import com.ruoyi.device.service.api.IAirTypeGeneralEnumService;
 import com.ruoyi.device.service.dto.AirTypeGeneralEnumDTO;
 import com.ruoyi.system.api.RemoteDictService;
 import com.ruoyi.system.api.domain.SysDictData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 无人机类型通用枚举Controller
@@ -32,7 +26,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/airType/generalEnum")
-public class AirTypeGeneralEnumController extends BaseController
+public class DeviceAirTypeGeneralEnumController extends BaseController
 {
     @Autowired
     private IAirTypeGeneralEnumService airTypeGeneralEnumService;
@@ -49,9 +43,9 @@ public class AirTypeGeneralEnumController extends BaseController
     @GetMapping("/list")
     public R<List<AirTypeGeneralEnumVO>> selectAirTypeGeneralEnumList(AirTypeGeneralEnumVO vo)
     {
-        AirTypeGeneralEnumDTO dto = AirTypeGeneralEnumVOConvert.to(vo);
+        AirTypeGeneralEnumDTO dto = DeviceAirTypeGeneralEnumVOConvert.to(vo);
         List<AirTypeGeneralEnumDTO> list = airTypeGeneralEnumService.selectAirTypeGeneralEnumList(dto);
-        List<AirTypeGeneralEnumVO> voList = AirTypeGeneralEnumVOConvert.fromList(list);
+        List<AirTypeGeneralEnumVO> voList = DeviceAirTypeGeneralEnumVOConvert.fromList(list);
         return R.ok(voList);
     }
 
@@ -71,7 +65,7 @@ public class AirTypeGeneralEnumController extends BaseController
         {
             // 获取所有无人机类型数据
             List<AirTypeGeneralEnumDTO> allList = airTypeGeneralEnumService.selectAirTypeGeneralEnumList(new AirTypeGeneralEnumDTO());
-            List<AirTypeGeneralEnumVO> allVoList = AirTypeGeneralEnumVOConvert.fromList(allList);
+            List<AirTypeGeneralEnumVO> allVoList = DeviceAirTypeGeneralEnumVOConvert.fromList(allList);
             
             // 为每个字典项创建分组
             for (SysDictData dictData : dictResult.getData())
diff --git a/src/main/java/com/ruoyi/device/controller/convert/AirTypeGeneralEnumVOConvert.java b/src/main/java/com/ruoyi/device/controller/convert/DeviceAirTypeGeneralEnumVOConvert.java
similarity index 77%
rename from src/main/java/com/ruoyi/device/controller/convert/AirTypeGeneralEnumVOConvert.java
rename to src/main/java/com/ruoyi/device/controller/convert/DeviceAirTypeGeneralEnumVOConvert.java
index 5ff7e65..2eb17b4 100644
--- a/src/main/java/com/ruoyi/device/controller/convert/AirTypeGeneralEnumVOConvert.java
+++ b/src/main/java/com/ruoyi/device/controller/convert/DeviceAirTypeGeneralEnumVOConvert.java
@@ -12,12 +12,12 @@ import java.util.List;
  * @author 拓恒
  * @date 2026-01-20
  */
-public class AirTypeGeneralEnumVOConvert extends BaseConvert<AirTypeGeneralEnumDTO, AirTypeGeneralEnumVO>
+public class DeviceAirTypeGeneralEnumVOConvert extends BaseConvert<AirTypeGeneralEnumDTO, AirTypeGeneralEnumVO>
 {
 
-    private static final AirTypeGeneralEnumVOConvert INSTANCE = new AirTypeGeneralEnumVOConvert();
+    private static final DeviceAirTypeGeneralEnumVOConvert INSTANCE = new DeviceAirTypeGeneralEnumVOConvert();
 
-    private AirTypeGeneralEnumVOConvert() {
+    private DeviceAirTypeGeneralEnumVOConvert() {
         super(AirTypeGeneralEnumDTO.class, AirTypeGeneralEnumVO.class);
     }