|
@@ -41,26 +41,25 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, SceneEntity> impl
|
|
|
|
|
|
@Override
|
|
|
public SceneEntity findBySceneCode(String sceneCode) {
|
|
|
- LambdaQueryWrapper<SceneEntity> wrapper=new LambdaQueryWrapper<>();
|
|
|
- wrapper.eq(SceneEntity::getSceneCode,sceneCode);
|
|
|
+ LambdaQueryWrapper<SceneEntity> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ wrapper.eq(SceneEntity::getSceneCode, sceneCode);
|
|
|
return getOne((wrapper));
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public Object getPointInfo(String sceneCode) {
|
|
|
- Map<String,Object> pointInfo = new HashMap<>(2);
|
|
|
+ Map<String, Object> pointInfo = new HashMap<>(2);
|
|
|
SceneEntity scene = sceneService.findBySceneCode(sceneCode);
|
|
|
|
|
|
List<FilterEntity> filters = filterService.getAllByDatasetId(scene.getDatasetId());
|
|
|
|
|
|
- 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());
|
|
|
+ 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("rotation", filter.getDataset_orientation());
|
|
|
+ point.put("fileId", filter.getFile_id());
|
|
|
return point;
|
|
|
}).collect(Collectors.toList());
|
|
|
pointInfo.put("point", points);
|
|
@@ -69,7 +68,7 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, SceneEntity> impl
|
|
|
if (ctrlPoint.getStatus() == 0) {
|
|
|
return pointInfo;
|
|
|
}
|
|
|
- Map<String,Object> ctrlResult = new HashMap<>(5);
|
|
|
+ Map<String, Object> ctrlResult = new HashMap<>(5);
|
|
|
ctrlResult.put("ageControlLocation1", ctrlPoint.getAgeControlLocation1());
|
|
|
ctrlResult.put("ageControlLocation2", ctrlPoint.getAgeControlLocation2());
|
|
|
ctrlResult.put("epsg", ctrlPoint.getEpsg());
|