修改协作场景逻辑

4dkankan-web/src/main/java/com/fdkankan/web/controller/SceneCooperationController.java

@@ -206,47 +206,53 @@ public class SceneCooperationController extends BaseController {
         List<SceneProEntity> sceneEntityList = new ArrayList<>();
         List<FolderEntity> folderEntityList = new ArrayList<>();
 
+        if(sceneNumList.size() <= 0){
+            result.addAll(folderService.convert(folderEntityList));
+            PageInfo<Object> data = PageInfoUtils.list2PageInfo(result, param.getPageNum(), param.getPageSize());
+            return Result.success(data);
+        }
+
         //根目录时，需要排除已经归类的场景
-        if(param.getFolderId() == null){
+        if(param.getFolderId() == null ){
             //查询出所有协作场景的文件夹
-            condition = new Condition(FolderEntity.class);
-            condition.and().andEqualTo("userId", ssoUser.getId()).andEqualTo("type", param.getFolderType());
-            List<FolderEntity> folderList = folderService.findAll(condition, "create_time desc");
-            for (FolderEntity folderEntity : folderList) {
-                //获取根目录文件夹数量
-                if(folderEntity.getParentId() == null){
-                    folderEntityList.add(folderEntity);
-                }
-            }
-
-            //没有协作场景，直接放回文件夹的列表
-            if(sceneNumList.size() <= 0){
-                result.addAll(folderService.convert(folderEntityList));
-                PageInfo<Object> data = PageInfoUtils.list2PageInfo(result, param.getPageNum(), param.getPageSize());
-                return Result.success(data);
-            }
+//            condition = new Condition(FolderEntity.class);
+//            condition.and().andEqualTo("userId", ssoUser.getId()).andEqualTo("type", param.getFolderType());
+//            List<FolderEntity> folderList = folderService.findAll(condition, "create_time desc");
+//            for (FolderEntity folderEntity : folderList) {
+//                //获取根目录文件夹数量
+//                if(folderEntity.getParentId() == null){
+//                    folderEntityList.add(folderEntity);
+//                }
+//            }
+//
+//            //没有协作场景，直接放回文件夹的列表
+//            if(sceneNumList.size() <= 0){
+//                result.addAll(folderService.convert(folderEntityList));
+//                PageInfo<Object> data = PageInfoUtils.list2PageInfo(result, param.getPageNum(), param.getPageSize());
+//                return Result.success(data);
+//            }
 
             //查出所有已经归类的场景id
-            List<Long> sceneIdList = new ArrayList<>();
-
-            Condition folderSceneCondition = null;
-            List<FolderSceneEntity> folderSceneList = null;
-            for (FolderEntity folderEntity : folderList) {
-                folderSceneCondition = new Condition(FolderSceneEntity.class);
-                folderSceneCondition.and().andEqualTo("folderId", folderEntity.getId());
-
-                folderSceneList = folderSceneService.findAll(folderSceneCondition, "create_time desc");
-                if(folderSceneList != null && folderSceneList.size() > 0){
-                    for (FolderSceneEntity folderSceneEntity : folderSceneList) {
-                        sceneIdList.add(folderSceneEntity.getSceneId());
-                    }
-                }
-            }
+//            List<Long> sceneIdList = new ArrayList<>();
+//
+//            Condition folderSceneCondition = null;
+//            List<FolderSceneEntity> folderSceneList = null;
+//            for (FolderEntity folderEntity : folderList) {
+//                folderSceneCondition = new Condition(FolderSceneEntity.class);
+//                folderSceneCondition.and().andEqualTo("folderId", folderEntity.getId());
+//
+//                folderSceneList = folderSceneService.findAll(folderSceneCondition, "create_time desc");
+//                if(folderSceneList != null && folderSceneList.size() > 0){
+//                    for (FolderSceneEntity folderSceneEntity : folderSceneList) {
+//                        sceneIdList.add(folderSceneEntity.getSceneId());
+//                    }
+//                }
+//            }
             Condition sceneCondition = new Condition(SceneProEntity.class);
             sceneCondition.and().andNotEqualTo("sceneSource", "11").andIn("num", sceneNumList);
-            if(sceneIdList.size() > 0){
-                sceneCondition.and().andNotIn("id", sceneIdList);
-            }
+//            if(sceneIdList.size() > 0){
+//                sceneCondition.and().andNotIn("id", sceneIdList);
+//            }
             if(param.getSceneSource() != null){
                 sceneCondition.and().andEqualTo("sceneSource", param.getSceneSource());
             }
@@ -328,6 +334,12 @@ public class SceneCooperationController extends BaseController {
                     if(cameraEntity != null){
                         responseScene.setChildName(cameraEntity.getChildName());
                         responseScene.setSnCode(cameraEntity.getSnCode());
+                    }else{
+                        cameraEntity = goodsService.findCameraById(responseScene.getCameraId());
+                        if(cameraEntity != null){
+                            responseScene.setChildName(cameraEntity.getChildName());
+                            responseScene.setSnCode(cameraEntity.getSnCode());
+                        }
                     }
                 }