|
@@ -52,7 +52,18 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, SceneEntity> impl
|
|
|
SceneEntity scene = sceneService.findBySceneCode(sceneCode);
|
|
|
|
|
|
List<FilterEntity> filters = filterService.getAllByDatasetId(scene.getDatasetId());
|
|
|
- pointInfo.put("point", filters);
|
|
|
+
|
|
|
+ List<Map<String,Object>> points = filters.stream().map(filter->{
|
|
|
+ Map<String,Object> point = new HashMap<>();
|
|
|
+ point.put("id",filter.getId());
|
|
|
+ point.put("datasetLocation",filter.getDataset_location());
|
|
|
+ point.put("location",filter.getLocation());
|
|
|
+ point.put("datasetFloorLocation",filter.getDataset_floor_location());
|
|
|
+ point.put("datasetOrientation",filter.getDataset_orientation());
|
|
|
+ point.put("fileId",filter.getFile_id());
|
|
|
+ return point;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ pointInfo.put("point", points);
|
|
|
|
|
|
ControlPointEntity ctrlPoint = controlPointService.findByDatasetId(scene.getDatasetId());
|
|
|
if (ctrlPoint.getStatus() == 0) {
|