THENG
/
a-tuoheng-device
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fit:设备分类接口增加，分类分组-新老写法兼容

This commit is contained in:
gyb 2026-02-09 13:49:38 +08:00
parent 87d7de414e
commit 73f089b673
1 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/com/ruoyi/device/controller/DeviceAirTypeGeneralEnumController.java
View File

@ -51,9 +51,8 @@ public class DeviceAirTypeGeneralEnumController extends BaseController
List<AirTypeGeneralEnumVO> voList = DeviceAirTypeGeneralEnumVOConvert.fromList(list);
return R.ok(voList);
}
/**
* 按厂商分组查询无人机类型（厂商 -> 分类 -> 设备类型）
* 按厂商分组查询无人机类型
*
* @return 按厂商分组的无人机类型列表
*/
@ -64,6 +63,48 @@ public class DeviceAirTypeGeneralEnumController extends BaseController
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);
List<AirTypeVendorGroupVO> vendorGroupList = new ArrayList<>();
if (dictResult.getData() != null)
{
// 获取所有无人机类型数据（包括生效和失效的）