|
@@ -89,6 +89,28 @@ public class SceneService implements ISceneService {
|
|
param.setSnCodes(snCodes);
|
|
param.setSnCodes(snCodes);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if(StringUtils.isNotBlank(param.getDeptId())){
|
|
|
|
+ List<TmCamera> tmCameras = tmCameraService.getByDeptIds(Arrays.asList(param.getDeptId()));
|
|
|
|
+ Set<String> snCodeSet = tmCameras.parallelStream().map(TmCamera::getCameraSn).collect(Collectors.toSet());
|
|
|
|
+ List<String> snCodes = param.getSnCodes();
|
|
|
|
+ if(snCodes == null){
|
|
|
|
+ snCodes = new ArrayList<>(snCodeSet);
|
|
|
|
+ }else {
|
|
|
|
+ snCodes = snCodes.stream().filter(snCodeSet::contains).collect(Collectors.toList());
|
|
|
|
+ }
|
|
|
|
+ param.setSnCodes(snCodes);
|
|
|
|
+ }
|
|
|
|
+ if(StringUtils.isNotBlank(param.getSnCode())){
|
|
|
|
+ List<String> snCodes = param.getSnCodes();
|
|
|
|
+ List<String> snCodes1 = new ArrayList<>();
|
|
|
|
+ snCodes1.add(param.getSnCode());
|
|
|
|
+ if(snCodes == null){
|
|
|
|
+ snCodes = snCodes1;
|
|
|
|
+ }else {
|
|
|
|
+ snCodes = snCodes.stream().filter(snCodes1::contains).collect(Collectors.toList());
|
|
|
|
+ }
|
|
|
|
+ param.setSnCodes(snCodes);
|
|
|
|
+ }
|
|
List<SceneVo> sceneVoList = new ArrayList<>();
|
|
List<SceneVo> sceneVoList = new ArrayList<>();
|
|
long total = 0;
|
|
long total = 0;
|
|
if(param.getType() == 0 || param.getType() == 1 || param.getType() == 4){ //看看,看见 ,深时obj
|
|
if(param.getType() == 0 || param.getType() == 1 || param.getType() == 4){ //看看,看见 ,深时obj
|