|
@@ -49,9 +49,9 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
|
|
|
.code(o.getRailwayCode())
|
|
|
.name(o.getRailwayName())
|
|
|
.flay(true)
|
|
|
+ .publicWorksSection(o.getPublicWorksSection())
|
|
|
.children(new ArrayList<>())
|
|
|
.build();
|
|
|
-
|
|
|
if (!cameraTree.getChildren().stream()
|
|
|
.map(CameraTree::getCode)
|
|
|
.collect(Collectors.toList())
|
|
@@ -59,18 +59,16 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
|
|
|
cameraTree.getChildren().add(build);
|
|
|
map.put(o.getRailwayCode(), build);
|
|
|
}
|
|
|
-
|
|
|
// 里程
|
|
|
String mils = AppendUtils.stringAppend(o.getInstallMile());
|
|
|
CameraTree build1 = CameraTree.builder()
|
|
|
.code(mils + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"))
|
|
|
.name(mils + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"))
|
|
|
.flay(true)
|
|
|
+ .publicWorksSection(o.getPublicWorksSection())
|
|
|
.mileage(o.getInstallMile())
|
|
|
.children(new ArrayList<>())
|
|
|
.build();
|
|
|
-
|
|
|
-
|
|
|
if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode()))) {
|
|
|
CameraTree cameraTree1 = map.get(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"));
|
|
|
if (ObjectUtils.isEmpty(cameraTree1)) {
|
|
@@ -78,23 +76,19 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
|
|
|
map.get(o.getRailwayCode()).getChildren().add(build1);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
// 摄像头
|
|
|
CameraTree build2 = CameraTree.builder()
|
|
|
.code(o.getCameraCode())
|
|
|
.name(o.getCameraCode())
|
|
|
.flay(true)
|
|
|
+ .publicWorksSection(o.getPublicWorksSection())
|
|
|
.children(new ArrayList<>())
|
|
|
.build();
|
|
|
-
|
|
|
-
|
|
|
if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")))) {
|
|
|
map.get(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")).getChildren().add(build2);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
return cameraTree;
|
|
|
}
|
|
|
}
|