1.1.3 监控单元Controller修改

dev
zhouhy 1 year ago
parent 7f13f3c0e7
commit cef22f8287

@ -52,7 +52,9 @@ public class HwMonitorPlatformController extends BaseController {
* @throws * @throws
* */ * */
@GetMapping("/treeList") @GetMapping("/treeList")
public TableDataInfo treeList(@RequestBody List<HwMonitorUnit> hwMonitorUnits){ public TableDataInfo treeList(){
HwMonitorUnit hwMonitorUnit = new HwMonitorUnit();
List<HwMonitorUnit> hwMonitorUnits = hwMonitorUnitService.selectHwMonitorUnitList(hwMonitorUnit);
List<HwMonitorUnit> list = hwMonitorUnitService.selectTreeList(hwMonitorUnits); List<HwMonitorUnit> list = hwMonitorUnitService.selectTreeList(hwMonitorUnits);
return getDataTable(list); return getDataTable(list);

@ -280,14 +280,18 @@ public class HwMonitorUnitServiceImpl implements IHwMonitorUnitService
public List<HwMonitorUnit> selectTreeList(List<HwMonitorUnit> hwMonitorUnits) { public List<HwMonitorUnit> selectTreeList(List<HwMonitorUnit> hwMonitorUnits) {
List<HwMonitorUnit> returnList = new ArrayList<>(); List<HwMonitorUnit> returnList = new ArrayList<>();
List<Long> tempList = hwMonitorUnits.stream().map(HwMonitorUnit::getMonitorUnitId).collect(Collectors.toList()); List<Long> tempList = hwMonitorUnits.stream().map(HwMonitorUnit::getMonitorUnitId).collect(Collectors.toList());
List<HwMonitorUnit> treeList = new ArrayList<>();
for (HwMonitorUnit hwMonitorUnit:hwMonitorUnits){ for (HwMonitorUnit hwMonitorUnit:hwMonitorUnits){
if (!tempList.contains(hwMonitorUnit.getParentId())) if (!tempList.contains(hwMonitorUnit.getParentId()))
recursionFn(hwMonitorUnits,hwMonitorUnit); recursionFn(hwMonitorUnits,hwMonitorUnit);
returnList.add(hwMonitorUnit); returnList.add(hwMonitorUnit);
} }
for (int i = 0; i < returnList.size(); i++){
return returnList; if (returnList.get(i).getParentId()==null){
treeList.add(returnList.get(i));
}
}
return treeList;
} }
private void recursionFn(List<HwMonitorUnit> list, HwMonitorUnit t) private void recursionFn(List<HwMonitorUnit> list, HwMonitorUnit t)
{ {

Loading…
Cancel
Save