|
|
|
@ -358,7 +358,24 @@ public class BoardServiceImpl implements IBoardService {
|
|
|
|
|
BaseLineMonitor lineMonitor = new BaseLineMonitor();
|
|
|
|
|
lineMonitor.setMonitorType(Long.valueOf(String.valueOf(paramMap.get("energyType"))));
|
|
|
|
|
List<BaseLineMonitor> list = baseLineMonitorService.selectBaseLineMonitorList(lineMonitor);
|
|
|
|
|
List<Ztree> ztrees = new ArrayList<Ztree>();
|
|
|
|
|
|
|
|
|
|
if(paramMap.containsKey("objId")){
|
|
|
|
|
Long objId = Long.valueOf(String.valueOf(paramMap.get("objId")));
|
|
|
|
|
List<BaseLineMonitor> arrayList = new ArrayList<>();
|
|
|
|
|
lineMonitor.setParentId(objId);
|
|
|
|
|
List<BaseLineMonitor> 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<Ztree> 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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|