合并代码

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -888,7 +888,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
     private Integer getShootCount(ScenePlusExt scenePlusExt){
         String homePath = SceneUtil.getHomePath(scenePlusExt.getDataSource());
-        if(scenePlusExt.getLocation() == 5){
+        if(Objects.nonNull(scenePlusExt.getLocation()) && scenePlusExt.getLocation() == 5){
             String slamDataStr = fYunFileService.getFileContent(homePath.concat("slam_data.json"));
             JSONObject slamDataObj = JSON.parseObject(slamDataStr);
             JSONArray viewsInfo = slamDataObj.getJSONArray("views_info");