diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/BoardServiceImpl.java b/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/BoardServiceImpl.java index 72667ee50..03fc033f8 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/BoardServiceImpl.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/BoardServiceImpl.java @@ -358,7 +358,24 @@ public class BoardServiceImpl implements IBoardService { BaseLineMonitor lineMonitor = new BaseLineMonitor(); lineMonitor.setMonitorType(Long.valueOf(String.valueOf(paramMap.get("energyType")))); List list = baseLineMonitorService.selectBaseLineMonitorList(lineMonitor); - List ztrees = new ArrayList(); + + if(paramMap.containsKey("objId")){ + Long objId = Long.valueOf(String.valueOf(paramMap.get("objId"))); + List arrayList = new ArrayList<>(); + lineMonitor.setParentId(objId); + List array2List = baseLineMonitorService.selectBaseLineMonitorList(lineMonitor); + for (BaseLineMonitor monitor : list) { + if (monitor.getObjid().equals(objId)){ + monitor.setParentId(0L); + arrayList.add(monitor); + } + } + list = new ArrayList<>(); + list.addAll(arrayList); + list.addAll(array2List); + } + + List ztrees = new ArrayList<>(); for (BaseLineMonitor baseLineMonitor : list) { Ztree ztree = new Ztree(); ztree.setId(baseLineMonitor.getObjid()); @@ -371,6 +388,7 @@ public class BoardServiceImpl implements IBoardService { return result; } + /** * 表具实时状态 * @param paramMap @@ -387,6 +405,4 @@ public class BoardServiceImpl implements IBoardService { return result; } - - }