|
@@ -44,7 +44,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
|
|
|
for (BaseCameraManagementDto o : list) {
|
|
|
// 线路
|
|
|
CameraTree build = CameraTree.builder()
|
|
|
- .code(o.getRailwayCode().toString())
|
|
|
+ .code(o.getRailwayCode())
|
|
|
.name(o.getRailwayName())
|
|
|
.flay(true)
|
|
|
.children(new ArrayList<>())
|
|
@@ -55,7 +55,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
|
|
|
.collect(Collectors.toList())
|
|
|
.contains(build.getCode())) {
|
|
|
cameraTree.getChildren().add(build);
|
|
|
- map.put(o.getRailwayCode().toString(), build);
|
|
|
+ map.put(o.getRailwayCode(), build);
|
|
|
}
|
|
|
|
|
|
// 里程
|
|
@@ -67,11 +67,11 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
|
|
|
.build();
|
|
|
|
|
|
|
|
|
- if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode().toString()))) {
|
|
|
+ if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode()))) {
|
|
|
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);
|
|
|
+ map.get(o.getRailwayCode()).getChildren().add(build1);
|
|
|
}
|
|
|
}
|
|
|
|