|
|
|
@ -280,14 +280,18 @@ public class HwMonitorUnitServiceImpl implements IHwMonitorUnitService
|
|
|
|
|
public List<HwMonitorUnit> selectTreeList(List<HwMonitorUnit> hwMonitorUnits) {
|
|
|
|
|
List<HwMonitorUnit> returnList = new ArrayList<>();
|
|
|
|
|
List<Long> tempList = hwMonitorUnits.stream().map(HwMonitorUnit::getMonitorUnitId).collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
List<HwMonitorUnit> 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<HwMonitorUnit> list, HwMonitorUnit t)
|
|
|
|
|
{
|
|
|
|
|