diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java index e170d66..e825b7f 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java @@ -52,7 +52,9 @@ public class HwMonitorPlatformController extends BaseController { * @throws * */ @GetMapping("/treeList") - public TableDataInfo treeList(@RequestBody List hwMonitorUnits){ + public TableDataInfo treeList(){ + HwMonitorUnit hwMonitorUnit = new HwMonitorUnit(); + List hwMonitorUnits = hwMonitorUnitService.selectHwMonitorUnitList(hwMonitorUnit); List list = hwMonitorUnitService.selectTreeList(hwMonitorUnits); return getDataTable(list); diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwDeviceModeFunctionMapper.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwDeviceModeFunctionMapper.java index 9985ee4..4a94095 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwDeviceModeFunctionMapper.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwDeviceModeFunctionMapper.java @@ -1,61 +1,61 @@ -package com.ruoyi.business.mapper; - -import java.util.List; -import com.ruoyi.business.domain.HwDeviceModeFunction; - -/** - * 设备模型功能Mapper接口 - * - * @author xins - * @date 2023-09-05 - */ -public interface HwDeviceModeFunctionMapper -{ - /** - * 查询设备模型功能 - * - * @param modeFunctionId 设备模型功能主键 - * @return 设备模型功能 - */ - public HwDeviceModeFunction selectHwDeviceModeFunctionByModeFunctionId(Long modeFunctionId); - - /** - * 查询设备模型功能列表 - * - * @param hwDeviceModeFunction 设备模型功能 - * @return 设备模型功能集合 - */ - public List selectHwDeviceModeFunctionList(HwDeviceModeFunction hwDeviceModeFunction); - - /** - * 新增设备模型功能 - * - * @param hwDeviceModeFunction 设备模型功能 - * @return 结果 - */ - public int insertHwDeviceModeFunction(HwDeviceModeFunction hwDeviceModeFunction); - - /** - * 修改设备模型功能 - * - * @param hwDeviceModeFunction 设备模型功能 - * @return 结果 - */ - public int updateHwDeviceModeFunction(HwDeviceModeFunction hwDeviceModeFunction); - - /** - * 删除设备模型功能 - * - * @param modeFunctionId 设备模型功能主键 - * @return 结果 - */ - public int deleteHwDeviceModeFunctionByModeFunctionId(Long modeFunctionId); - - /** - * 批量删除设备模型功能 - * - * @param modeFunctionIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteHwDeviceModeFunctionByModeFunctionIds(Long[] modeFunctionIds); -} +package com.ruoyi.business.mapper; + +import java.util.List; +import com.ruoyi.business.domain.HwDeviceModeFunction; + +/** + * 设备模型功能Mapper接口 + * + * @author xins + * @date 2023-09-05 + */ +public interface HwDeviceModeFunctionMapper +{ + /** + * 根据主键查询设备模型功能 + * + * @param modeFunctionId 设备模型功能主键 + * @return 设备模型功能 + */ + public HwDeviceModeFunction selectHwDeviceModeFunctionByModeFunctionId(Long modeFunctionId); + + /** + * 查询设备模型功能列表 + * + * @param hwDeviceModeFunction 设备模型功能 + * @return 设备模型功能集合 + */ + public List selectHwDeviceModeFunctionList(HwDeviceModeFunction hwDeviceModeFunction); + + /** + * 新增设备模型功能 + * + * @param hwDeviceModeFunction 设备模型功能 + * @return 结果 + */ + public int insertHwDeviceModeFunction(HwDeviceModeFunction hwDeviceModeFunction); + + /** + * 修改设备模型功能 + * + * @param hwDeviceModeFunction 设备模型功能 + * @return 结果 + */ + public int updateHwDeviceModeFunction(HwDeviceModeFunction hwDeviceModeFunction); + + /** + * 删除设备模型功能 + * + * @param modeFunctionId 设备模型功能主键 + * @return 结果 + */ + public int deleteHwDeviceModeFunctionByModeFunctionId(Long modeFunctionId); + + /** + * 批量删除设备模型功能 + * + * @param modeFunctionIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteHwDeviceModeFunctionByModeFunctionIds(Long[] modeFunctionIds); +} diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwMonitorUnitServiceImpl.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwMonitorUnitServiceImpl.java index c7c5784..be57e45 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwMonitorUnitServiceImpl.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwMonitorUnitServiceImpl.java @@ -280,14 +280,18 @@ public class HwMonitorUnitServiceImpl implements IHwMonitorUnitService public List selectTreeList(List hwMonitorUnits) { List returnList = new ArrayList<>(); List tempList = hwMonitorUnits.stream().map(HwMonitorUnit::getMonitorUnitId).collect(Collectors.toList()); - + List treeList = new ArrayList<>(); for (HwMonitorUnit hwMonitorUnit:hwMonitorUnits){ if (!tempList.contains(hwMonitorUnit.getParentId())) recursionFn(hwMonitorUnits,hwMonitorUnit); returnList.add(hwMonitorUnit); } - - return returnList; + for (int i = 0; i < returnList.size(); i++){ + if (returnList.get(i).getParentId()==null){ + treeList.add(returnList.get(i)); + } + } + return treeList; } private void recursionFn(List list, HwMonitorUnit t) {