1

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

@@ -188,6 +188,9 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
         if(scenePlusList.size() >0){
             versionList.add("v4");
         }
+        if(versionList.size() <=0){
+            versionList.add("v3");
+        }
         List<SceneResource> results = sceneResourceService.getByVersion(versionList);
         jsonObject.put("include", results);
         return jsonObject;

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

@@ -21,10 +21,7 @@ import com.fdkankan.ucenter.mapper.IScenePlusMapper;
 import com.fdkankan.ucenter.service.*;
 
 import java.io.File;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
 import com.fdkankan.ucenter.vo.ResponseScene;
@@ -106,9 +103,12 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
     @Override
     public List<ScenePlus> getListByCameraIds(List<Long> cameraIds) {
-        LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(ScenePlus::getCameraId,cameraIds);
-        return this.list(wrapper);
+        if(cameraIds.size() >0){
+            LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(ScenePlus::getCameraId,cameraIds);
+            return this.list(wrapper);
+        }
+        return new ArrayList<>();
     }
 
     @Override

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

@@ -7,6 +7,7 @@ import com.fdkankan.ucenter.service.ISceneResourceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -27,9 +28,12 @@ public class SceneResourceServiceImpl extends ServiceImpl<ISceneResourceMapper,
 
     @Override
     public List<SceneResource> getByVersion(List<String> versionList) {
-        LambdaQueryWrapper<SceneResource> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(SceneResource::getVersion,versionList);
-        return this.list(wrapper);
+        if(versionList.size() >0){
+            LambdaQueryWrapper<SceneResource> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(SceneResource::getVersion,versionList);
+            return this.list(wrapper);
+        }
+        return new ArrayList<>();
     }
 
     @Override