|
@@ -96,6 +96,9 @@ public class AppSceneService {
|
|
|
HashMap<Long, Camera> cameraHashMap = cameraService.getByIds(cameraIds);
|
|
|
HashMap<Long, CameraDetail> detailHashMap = cameraDetailService.getByCameraIds(cameraIds);
|
|
|
|
|
|
+ /**
|
|
|
+ * sceneSourceType 0 相机场景,1用户场景 2 协作场景
|
|
|
+ */
|
|
|
for (AppSceneVo record : page.getRecords()) {
|
|
|
record.setChildName(record.getSnCode());
|
|
|
if (record.getStatus() == -1) {
|
|
@@ -106,7 +109,7 @@ public class AppSceneService {
|
|
|
if(record.getCameraId() == null){
|
|
|
record.setSceneSourceType(record.getUserId().longValue() == param.getUserId() ? 1 : 2);
|
|
|
}else {
|
|
|
- record.setSceneSourceType(0);
|
|
|
+ record.setSceneSourceType(1);
|
|
|
Camera camera = cameraHashMap.get(record.getCameraId());
|
|
|
if(camera == null){
|
|
|
continue;
|
|
@@ -123,7 +126,7 @@ public class AppSceneService {
|
|
|
}
|
|
|
//相机的userId为空,表示相机的场景
|
|
|
if (cameraDetail.getUserId() == null || param.getUserId() == null ) {
|
|
|
- record.setSceneSourceType(0);
|
|
|
+ record.setSceneSourceType(1);
|
|
|
continue;
|
|
|
}
|
|
|
if (cameraDetail.getUserId().equals(param.getUserId())) {
|
|
@@ -134,7 +137,7 @@ public class AppSceneService {
|
|
|
if (param.getCameraId()!=null && cameraDetail.getCameraId().equals(param.getCameraId())) {
|
|
|
if (cameraDetail.getCooperationUser() == null) {
|
|
|
//场景相机id等于该相机id
|
|
|
- record.setSceneSourceType(0);
|
|
|
+ record.setSceneSourceType(1);
|
|
|
} else if (cameraDetail.getCooperationUser().equals(param.getUserId())) {
|
|
|
record.setSceneSourceType(2);
|
|
|
}
|