From 73f089b673052874dac6b1726ba3953394c148b9 Mon Sep 17 00:00:00 2001
From: gyb <gyb@example.com>
Date: Mon, 9 Feb 2026 13:49:38 +0800
Subject: [PATCH] =?UTF-8?q?fit:=E8=AE=BE=E5=A4=87=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=EF=BC=8C=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E5=88=86=E7=BB=84-=E6=96=B0=E8=80=81=E5=86=99=E6=B3=95?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeviceAirTypeGeneralEnumController.java   | 45 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/controller/DeviceAirTypeGeneralEnumController.java b/src/main/java/com/ruoyi/device/controller/DeviceAirTypeGeneralEnumController.java
index 1b2f8ed..0979f08 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceAirTypeGeneralEnumController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceAirTypeGeneralEnumController.java
@@ -51,14 +51,55 @@ public class DeviceAirTypeGeneralEnumController extends BaseController
         List<AirTypeGeneralEnumVO> voList = DeviceAirTypeGeneralEnumVOConvert.fromList(list);
         return R.ok(voList);
     }
-
     /**
-     * 按厂商分组查询无人机类型（厂商 -> 分类 -> 设备类型）
+     * 按厂商分组查询无人机类型
      *
      * @return 按厂商分组的无人机类型列表
      */
     @GetMapping("/vendorGroup")
     public R<List<AirTypeVendorGroupVO>> selectAirTypeGeneralEnumGroupByVendor()
+    {
+        // 从数据字典获取无人机厂商类型
+        R<List<SysDictData>> dictResult = remoteDictService.getDictDataByType("air_vendor_type", SecurityConstants.INNER);
+        List<AirTypeVendorGroupVO> vendorGroupList = new ArrayList<>();
+
+        if (dictResult.getData() != null)
+        {
+            // 获取所有无人机类型数据
+            List<DeviceAirTypeGeneralEnumDTO> allList = airTypeGeneralEnumService.selectAirTypeGeneralEnumList(new DeviceAirTypeGeneralEnumDTO());
+            List<AirTypeGeneralEnumVO> allVoList = DeviceAirTypeGeneralEnumVOConvert.fromList(allList);
+
+            // 为每个字典项创建分组
+            for (SysDictData dictData : dictResult.getData())
+            {
+                AirTypeVendorGroupVO groupVO = new AirTypeVendorGroupVO();
+                groupVO.setLabel(dictData.getDictLabel());
+                groupVO.setValue(dictData.getDictValue());
+
+                // 筛选属于当前厂商的无人机类型
+                List<AirTypeGeneralEnumVO> vendorAirTypes = new ArrayList<>();
+                for (AirTypeGeneralEnumVO vo : allVoList)
+                {
+                    if (dictData.getDictValue().equals(vo.getVendorId().toString()))
+                    {
+                        vendorAirTypes.add(vo);
+                    }
+                }
+
+                groupVO.setAirTypeList(vendorAirTypes);
+                vendorGroupList.add(groupVO);
+            }
+        }
+
+        return R.ok(vendorGroupList);
+    }
+    /**
+     * 按厂商分组查询无人机类型（厂商 -> 分类 -> 设备类型）
+     *
+     * @return 按厂商分组的无人机类型列表
+     */
+    @GetMapping("/vendorGroupNew")
+    public R<List<AirTypeVendorGroupVO>> selectAirTypeGeneralEnumGroupByVendorNew()
     {
         // 从数据字典获取无人机厂商类型
         R<List<SysDictData>> dictResult = remoteDictService.getDictDataByType("air_vendor_type", SecurityConstants.INNER);