|
@@ -57,8 +57,13 @@ public class FusionService implements IFusionService {
|
|
|
public PageInfo scenePageList(SceneParam param, String token) {
|
|
|
LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
|
|
|
if(param.getSnCodes() != null && param.getSnCodes().size() >0){
|
|
|
- //todo
|
|
|
- //wrapper.in(ScenePlus::getCameraId,);
|
|
|
+ List<Camera> cameras = cameraService.getBySnCodes(param.getSnCodes());
|
|
|
+ if(cameras.size() >0){
|
|
|
+ List<Long> cameraIds = cameras.stream().map(Camera::getId).collect(Collectors.toList());
|
|
|
+ wrapper.in(ScenePlus::getCameraId,cameraIds);
|
|
|
+ }else {
|
|
|
+ return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
|
|
|
+ }
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(token)){
|
|
|
User user = userService.getByToken(token);
|