|
@@ -31,6 +31,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public CameraTree cameraTree(String name) {
|
|
public CameraTree cameraTree(String name) {
|
|
|
|
+ //1 父
|
|
CameraTree cameraTree = CameraTree.builder()
|
|
CameraTree cameraTree = CameraTree.builder()
|
|
.name("相机树")
|
|
.name("相机树")
|
|
.code("0")
|
|
.code("0")
|
|
@@ -38,10 +39,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
|
|
.children(new ArrayList<>())
|
|
.children(new ArrayList<>())
|
|
.build();
|
|
.build();
|
|
Map<String, CameraTree> map = new HashMap<>();
|
|
Map<String, CameraTree> map = new HashMap<>();
|
|
- Map<String, CameraTree> map1 = new HashMap<>();
|
|
|
|
-
|
|
|
|
List<BaseCameraManagementDto> list = baseDeviceDynamicManagementMapper.list(name);
|
|
List<BaseCameraManagementDto> list = baseDeviceDynamicManagementMapper.list(name);
|
|
-
|
|
|
|
if (list.size() > 0) {
|
|
if (list.size() > 0) {
|
|
for (BaseCameraManagementDto o : list) {
|
|
for (BaseCameraManagementDto o : list) {
|
|
// 线路
|
|
// 线路
|
|
@@ -70,8 +68,11 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
|
|
|
|
|
|
|
|
|
|
if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode().toString()))) {
|
|
if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode().toString()))) {
|
|
- map.get(o.getRailwayCode().toString()).getChildren().add(build1);
|
|
|
|
- map1.put(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"), build1);
|
|
|
|
|
|
+ CameraTree cameraTree1 = map.get(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"));
|
|
|
|
+ if (ObjectUtils.isEmpty(cameraTree1)) {
|
|
|
|
+ map.put(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"), build1);
|
|
|
|
+ map.get(o.getRailwayCode().toString()).getChildren().add(build1);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
// 摄像头
|
|
// 摄像头
|
|
@@ -83,8 +84,8 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
|
|
.build();
|
|
.build();
|
|
|
|
|
|
|
|
|
|
- if (!ObjectUtils.isEmpty(map1.get(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")))) {
|
|
|
|
- map1.get(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")).getChildren().add(build2);
|
|
|
|
|
|
+ if (!ObjectUtils.isEmpty(map.get(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")))) {
|
|
|
|
+ map.get(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")).getChildren().add(build2);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|