|
@@ -49,6 +49,8 @@ public class SceneService implements ISceneService {
|
|
|
ITmCameraService tmCameraService;
|
|
|
@Autowired
|
|
|
ICaseService caseService;
|
|
|
+ @Autowired
|
|
|
+ ITmProjectService tmProjectService;
|
|
|
|
|
|
@Override
|
|
|
public List<SceneVo> getSceneListAndModel(ScenePram param) {
|
|
@@ -111,6 +113,9 @@ public class SceneService implements ISceneService {
|
|
|
if(param.getCaseId() !=null){
|
|
|
CaseEntity caseEntity = caseService.getById(param.getCaseId());
|
|
|
String deptId = caseEntity.getDeptId();
|
|
|
+ if(caseEntity.getType() ==1){
|
|
|
+ deptId = tmProjectService.getById(caseEntity.getTmProjectId()).getDeptId();
|
|
|
+ }
|
|
|
List<TmCamera> tmCameras = tmCameraService.getByDeptIds(Arrays.asList(deptId));
|
|
|
List<String> snCodes = param.getSnCodes();
|
|
|
List<String> snCodes1 = tmCameras.stream().map(TmCamera::getCameraSn).collect(Collectors.toList());
|