ソースを参照

日本app云端场景修改稿

lyhzzz 2 年 前
コミット
cad99662dc

+ 6 - 3
src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

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