|
@@ -289,8 +289,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
|
|
|
resourceIdList.add(Long.valueOf(rId));
|
|
|
}
|
|
|
List<SceneResource> sceneResources = sceneResourceService.listByIds(resourceIdList);
|
|
|
- List<SceneResource> v4List = sceneResources.stream().filter(entity -> entity.getVersion().equals("v4")).collect(Collectors.toList());
|
|
|
List<SceneResource> v3List = sceneResources.stream().filter(entity -> entity.getVersion().equals("v3")).collect(Collectors.toList());
|
|
|
+ List<SceneResource> v4List = sceneResources.stream().filter(entity -> entity.getVersion().equals("v4")).collect(Collectors.toList());
|
|
|
if(v3List.size() >0 && v4List.size() >0){
|
|
|
resourceType = "all";
|
|
|
}
|