调整从720获取的场景列表

src/main/java/fcb/project/manager/base/service/custom/PanoService.java

@@ -99,7 +99,13 @@ public class PanoService {
             log.info("调用720获取最新的预览路径失败");
             return new TreeMap<>();
         }
-        JSONObject jsonObject = (JSONObject) rspBean.getData();
+        Map<String ,Object> jsonObject = null;
+        try {
+           jsonObject = (Map<String, Object>) rspBean.getData();
+        }catch (Exception e){
+            log.info("解析data数据失败");
+            return new TreeMap<>();
+        }
         if(null == jsonObject){
             log.info("解析720返回的data失败");
             return new TreeMap<>();
@@ -108,23 +114,20 @@ public class PanoService {
             log.info("解析720返回的data缺失list");
             return new TreeMap<>();
         }
-        JSONArray listArray = jsonObject.getJSONArray("list");
-        if(null == listArray || listArray.isEmpty()){
+        List<Map<String, Object>> list = null;
+        try {
+            list = (List<Map<String, Object>>) jsonObject.get("list");
+        }catch (Exception e){
+            log.info("720返回的data的list转换失败");
+            return new TreeMap<>();
+        }
+        if(null == list || list.isEmpty()){
             log.info("720返回的data的list为空");
             return new TreeMap<>();
         }
         TreeMap<String , Object> resultTree = new TreeMap<>();
-        for (int i = 0; i < listArray.size(); i++) {
-            JSONObject object = (JSONObject) listArray.get(i);
-            if(null != object){
-                if(object.containsKey("houseId") && object.containsKey("webSite")){
-                    String houseId = (String) object.get("houseId");
-                    String webSite = (String) object.get("webSite");
-                    if(StringUtils.isNoneBlank(houseId , webSite)){
-                        resultTree.put(houseId , webSite);
-                    }
-                }
-            }
+        for (int i = 0; i < list.size(); i++) {
+            resultTree.putAll(list.get(i));
         }
         return resultTree;
     }

src/main/java/fcb/project/manager/base/service/impl/TmHouseServiceImpl.java

@@ -101,10 +101,12 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
                 resultPage.getRecords().get(i).setCountNum(tmAuditService.countAuditNum(vrId));
                 if(!CollectionUtils.isEmpty(treeMap)){
                     String path = (String) treeMap.get(vrId);
-                    String outerHost = outerSceneVrHost.substring(0 , outerSceneVrHost.length() - 1);
-                    String innerHost = innerSceneVrHost.substring(0 , innerSceneVrHost.length() - 1);
-                    resultPage.getRecords().get(i).setInnerVrLink(innerHost + path);
-                    resultPage.getRecords().get(i).setInnerVrLink(outerHost + path);
+                    if(StringUtils.isNotBlank(path)){
+                        String outerHost = outerSceneVrHost.substring(0 , outerSceneVrHost.length() - 1);
+                        String innerHost = innerSceneVrHost.substring(0 , innerSceneVrHost.length() - 1);
+                        resultPage.getRecords().get(i).setInnerVrLink(innerHost + path);
+                        resultPage.getRecords().get(i).setVrLink(outerHost + path);
+                    }
                 }
             }
         }
@@ -163,10 +165,12 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
 
                 if(!CollectionUtils.isEmpty(treeMap)){
                     String path = (String) treeMap.get(vrId);
-                    String outerHost = outerSceneVrHost.substring(0 , outerSceneVrHost.length() - 1);
-                    String innerHost = innerSceneVrHost.substring(0 , innerSceneVrHost.length() - 1);
-                    resultPage.getRecords().get(i).setInnerVrLink(innerHost + path);
-                    resultPage.getRecords().get(i).setInnerVrLink(outerHost + path);
+                    if(StringUtils.isNotBlank(path)){
+                        String outerHost = outerSceneVrHost.substring(0 , outerSceneVrHost.length() - 1);
+                        String innerHost = innerSceneVrHost.substring(0 , innerSceneVrHost.length() - 1);
+                        resultPage.getRecords().get(i).setInnerVrLink(innerHost + path);
+                        resultPage.getRecords().get(i).setVrLink(outerHost + path);
+                    }
                 }
             }
         }

src/main/resources/application.properties

@@ -3,7 +3,7 @@
 #spring.profiles.active=prod
 #spring.profiles.active=dev
 spring.profiles.active=test
-
+PanoService
 #应用名
 spring.application.name=fbc-project-manager