From cef22f82877bdfedcfbdfdb7b899e612a23bc140 Mon Sep 17 00:00:00 2001 From: zhouhy Date: Thu, 14 Sep 2023 16:13:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.1.3=20=E7=9B=91=E6=8E=A7=E5=8D=95?= =?UTF-8?q?=E5=85=83Controller=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HwMonitorPlatformController.java | 4 +++- .../service/impl/HwMonitorUnitServiceImpl.java | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) 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/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) { From 41259cb5e6a40d47c994f466941386b0466ceb70 Mon Sep 17 00:00:00 2001 From: xins Date: Thu, 14 Sep 2023 16:19:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=E5=BE=AE=E6=9C=8D?= =?UTF-8?q?=E5=8A=A11.1.9=E7=89=88=E6=9C=AC=20=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/HwDeviceModeFunctionMapper.java | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwDeviceModeFunctionMapper.java 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 new file mode 100644 index 0000000..4a94095 --- /dev/null +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwDeviceModeFunctionMapper.java @@ -0,0 +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); +}