Merge branch 'getAppAllSceneByPage-update' into test

src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

@@ -105,10 +105,8 @@ public class AppSceneService {
         
         Page<AppSceneVo> page =  scenePlusMapper.pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
 
-        Set<Long> cameraIdSet = page.getRecords().stream().map(AppSceneVo::getCameraId).collect(Collectors.toSet());
-        List<Long> cameraIds =  new ArrayList<>(cameraIdSet);
-        HashMap<Long, Camera> cameraHashMap = cameraService.getByIds(cameraIds);
-        HashMap<Long, CameraDetail> detailHashMap = cameraDetailService.getByCameraIds(cameraIds);
+        //账号密码登录 sceneSourceType 取值 1用户场景，2协作场景
+        //相机登录     sceneSourceType 取值皆为0
 
         for (AppSceneVo record : page.getRecords()) {
             record.setChildName(record.getSnCode());
@@ -117,45 +115,9 @@ public class AppSceneService {
             } else if (record.getStatus() == 500) {
                 record.setStatus(-1);
             }
-            if(record.getCameraId() == null){
-                record.setSceneSourceType(record.getUserId().longValue() == param.getUserId() ? 1 : 2);
-            }else {
-                record.setSceneSourceType(0);
-                Camera camera = cameraHashMap.get(record.getCameraId());
-                if(camera == null){
-                    continue;
-                }
-                CameraDetail cameraDetail = detailHashMap.get(camera.getId());
-                if(cameraDetail == null){
-                    continue;
-                }
-                record.setChildName(camera.getChildName());
-                record.setSnCode(camera.getSnCode());
-                if(cooperationNumList.contains(record.getNum())){
-                    record.setSceneSourceType(2);
-                    continue ;
-                }
-                //相机的userId为空，表示相机的场景
-                if (cameraDetail.getUserId() == null || param.getUserId() == null ) {
-                    record.setSceneSourceType(0);
-                    continue;
-                }
-                if (cameraDetail.getUserId().equals(param.getUserId())) {
-                    //相机用户id等于该用户id，既为用户的场景
-                    record.setSceneSourceType(1);
-                    continue;
-                }
-                if (param.getCameraId()!=null && cameraDetail.getCameraId().equals(param.getCameraId())) {
-                    if (cameraDetail.getCooperationUser() == null) {
-                        //场景相机id等于该相机id
-                        record.setSceneSourceType(0);
-                    } else if (cameraDetail.getCooperationUser().equals(param.getUserId())) {
-                        record.setSceneSourceType(2);
-                    }
-                }
-
+            if(param.getUserId() != null && record.getUserId() != null){
+                record.setSceneSourceType(record.getUserId().equals(param.getUserId()) ? 1 :2);
             }
-
         }
         return PageInfo.PageInfo(page);
     }

src/main/java/com/fdkankan/ucenter/vo/response/AppSceneVo.java

@@ -28,7 +28,7 @@ public class AppSceneVo {
     private Long sceneNum;
     private String type;
 
-    private Integer sceneSourceType;
+    private Integer sceneSourceType = 0;
     private Long userId;
 
     private String dataSource;

src/main/resources/mapper/ucenter/ScenePlusMapper.xml

@@ -5,8 +5,9 @@
     <select id="pageList" resultType="com.fdkankan.ucenter.vo.response.AppSceneVo">
         SELECT p.id ,null as name ,0 as isFolder,null as type,null as parentId ,p.create_time,num,scene_name,scene_dec,
         p.status,pay_status,thumb,web_site,0 as is_upgrade,view_count,
-         p.camera_id,p.user_id ,p.data_source,p.scene_type,build_type
+         p.camera_id,p.user_id ,p.data_source,p.scene_type,build_type,ca.sn_code,ca.child_name
         FROM t_scene_pro p
+        left join t_camera ca on p.camera_id = ca.id
         left join `t_camera_detail` tcd on p.camera_id = tcd.camera_id
         WHERE is_upgrade = 0 and  p.rec_status = 'A'   AND ( p.status = 1 OR p.status = -2) AND p.scene_type != 99
         <include refid="commonWhere"></include>
@@ -16,8 +17,9 @@
         UNION
         SELECT p.id as id ,null as name ,0 as isFolder,null as type,null as parentId,p.create_time ,num,title as scene_name,description as scene_dec,
         scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,view_count,
-        p.camera_id,p.user_id,e.data_source,p.scene_type,build_type
+        p.camera_id,p.user_id,e.data_source,p.scene_type,build_type,ca.sn_code,ca.child_name
         FROM t_scene_plus p
+        left join t_camera ca on p.camera_id = ca.id
         LEFT JOIN t_scene_plus_ext e on p.id = e.plus_id
         left join `t_camera_detail` tcd on p.camera_id = tcd.camera_id
         WHERE  p.rec_status = 'A' AND ( p.scene_status = 1 OR p.scene_status = -2) AND p.scene_type != 99