Merge branch 'feature-sg-20230615-dsx' into test

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

@@ -893,7 +893,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
     private Integer getShootCount(ScenePlusExt scenePlusExt){
         String homePath = SceneUtil.getHomePath(scenePlusExt.getDataSource());
-        if(scenePlusExt.getLocation() == 5 || scenePlusExt.getLocation() == 6){
+        if(scenePlusExt.getLocation() == 5){
             String slamDataStr = fYunFileService.getFileContent(homePath.concat("slam_data.json"));
             JSONObject slamDataObj = JSON.parseObject(slamDataStr);
             JSONArray viewsInfo = slamDataObj.getJSONArray("views_info");
@@ -901,7 +901,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 return 0;
             }
             return viewsInfo.stream().mapToInt(info -> {
-                return ((JSONArray) info).size();
+                return  ((JSONObject) info).getJSONArray("list_pose").size();
             }).sum();
         }