调整从720获取的场景列表

src/main/java/fcb/project/manager/base/config/MyNacosLifecycle.java

@@ -26,7 +26,9 @@ public class MyNacosLifecycle implements ApplicationContextAware {
     public void setApplicationContext(ApplicationContext context) throws BeansException {
         if (registration != null) {
             String port = environment.getProperty("server.port");
-            registration.setPort(Integer.parseInt(port));
+//            registration.setPort(Integer.parseInt(port));
+            registration.setPort(8285);
+//            registration.register();
             registration.start();
         }
     }

src/main/java/fcb/project/manager/base/entity/PanoSceneBean.java

@@ -0,0 +1,66 @@
+package fcb.project.manager.base.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/1/29 17:32
+ * 4
+ */
+@Data
+public class PanoSceneBean implements Serializable {
+
+
+    /**
+     * createTime : 2021-01-28 20:44:44
+     * createUserId :
+     * description :
+     * fileName : 会客厅
+     * hengdaId : 1272364929734688769
+     * houseId : HUS000011354771321121353728
+     * icon : https://oss-xiaoan.oss-cn-shenzhen.aliyuncs.com/cms_pano_fcb/image/thumb_20210128_204443118.jpg
+     * id : pano1354772390761082880
+     * initVisual :
+     * isIndex : 1
+     * ossPath : https://oss-xiaoan.oss-cn-shenzhen.aliyuncs.com/cms_pano_fcb/HUS000011354771321121353728/fcb_AmrBOKiyY
+     * path : /mnt/cms_pano_fcb_data/HUS000011354771321121353728/fcb_AmrBOKiyY/fcb_AmrBOKiyY.jpg
+     * roomId :
+     * roomName :
+     * sceneCode : fcb_AmrBOKiyY
+     * sceneTitle : 会客厅
+     * someData :
+     * sort : 100
+     * status : 4
+     * type : building
+     * updateTime : 2021-01-28 20:44:44
+     * vrModelId :
+     * webSite : /hengda.html?m=fcb_AmrBOKiyY&prodId=1272364929734688769&houseId=HUS000011354771321121353728
+     */
+
+    private String createTime;
+    private String createUserId;
+    private String description;
+    private String fileName;
+    private String hengdaId;
+    private String houseId;
+    private String icon;
+    private String id;
+    private String initVisual;
+    private Integer isIndex;
+    private String ossPath;
+    private String path;
+    private String roomId;
+    private String roomName;
+    private String sceneCode;
+    private String sceneTitle;
+    private String someData;
+    private Integer sort;
+    private Integer status;
+    private String type;
+    private String updateTime;
+    private String vrModelId;
+    private String webSite;
+
+}

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import fcb.project.manager.base.entity.CommonRspBean;
+import fcb.project.manager.base.entity.PanoSceneBean;
 import fcb.project.manager.base.entity.SevenTwoZeroSceneRspBean;
 import fcb.project.manager.core.feignInterfaces.PanoFeign;
 import lombok.extern.log4j.Log4j2;
@@ -131,4 +132,31 @@ public class PanoService {
         }
         return resultTree;
     }
+
+    public String getOneVrLink(String houseId , String token){
+
+        if(StringUtils.isNoneBlank(houseId , token)){
+            CommonRspBean rspBean = panoFeign.getOneVrlink(houseId , token);
+            log.info("从720获取最新单个vrlink的预览路径的返回值为:{}" , JSON.toJSONString(rspBean));
+            if(null == rspBean || null == rspBean.getCode() || rspBean.getCode() != 0){
+                log.info("调用720获单个取最新的预览路径失败");
+                return "";
+            }
+            PanoSceneBean panoSceneBean = null;
+
+            try {
+                panoSceneBean = JSONObject.parseObject(JSON.toJSONString(rspBean.getData()) , PanoSceneBean.class);
+
+            }catch (Exception e){
+                log.info("720返回的data转换失败");
+                return "";
+            }
+            if(null == panoSceneBean){
+                log.info("720返回的data为空");
+                return "";
+            }
+            return panoSceneBean.getWebSite();
+        }
+        return "";
+    }
 }

src/main/java/fcb/project/manager/core/controller/HouseManagerController.java

@@ -163,10 +163,14 @@ public class HouseManagerController extends BaseController{
         if(StringUtils.isBlank(tmHouse.getSceneNum())){
             return Result.failure("该房源未生成场景码");
         }
+        String path = panoService.getOneVrLink(houseId , getToken());
+        if(StringUtils.isBlank(path)){
+            return Result.failure("可分享的链接未生成");
+        }
+        String newOuterSceneVrHost = outerSceneVrHost.substring(0 , outerSceneVrHost.length() - 1);
+        String totalVrUrl = newOuterSceneVrHost + path;
+        log.info("将要生成二维码的链接为:{}" , totalVrUrl);
         String totalOssQueryPath = "";
-        String totalVrUrl = outerSceneVrHost + sceneVrLink  + tmHouse.getSceneNum() + "&prodId=" + tmHouse.getFcbHouseId()
-                + "&houseId=" + tmHouse.getId();
-
         if(StringUtils.isBlank(tmHouse.getQrCode())){
             String localPath = imageLocalPath + "logo.png";
             String outPutImageName = System.currentTimeMillis() + ".jpg";
@@ -241,8 +245,13 @@ public class HouseManagerController extends BaseController{
             log.info("下载文件失败:{}" , fullLocalImagePath);
             return Result.failure("上传文件失败");
         }
-        String totalVrUrl = outerSceneVrHost + sceneVrLink + tmHouse.getSceneNum() + "&prodId=" + tmHouse.getFcbHouseId()
-                + "&houseId=" + tmHouse.getId();
+        String path = panoService.getOneVrLink(houseId , getToken());
+        if(StringUtils.isBlank(path)){
+            return Result.failure("可分享的链接未生成");
+        }
+        String newOuterSceneVrHost = outerSceneVrHost.substring(0 , outerSceneVrHost.length() - 1);
+        String totalVrUrl = newOuterSceneVrHost + path;
+        log.info("将要生成二维码的链接为:{}" , totalVrUrl);
         String outPutImageName = System.currentTimeMillis() + ".jpg";
         String outPutImageResultPath = imageLocalPath + outPutImageName;
         try {

src/main/java/fcb/project/manager/core/feignInterfaces/PanoFeign.java

@@ -27,4 +27,8 @@ public interface PanoFeign {
 
     @PostMapping("/fcb/pano/scene/house/findAllHouseId")
     public CommonRspBean getVrLinks(@RequestBody Map<String ,Object> body , @RequestHeader(name = "token") String token);
+
+    @GetMapping("/fcb/pano/scene/getIndex/{houseId}")
+    public CommonRspBean getOneVrlink(@PathVariable String houseId , @RequestHeader(name = "token") String token);
+
 }

src/main/resources/application-prod.properties

@@ -40,6 +40,6 @@ oss.bucket=fcb-vrkanfang-uat
 share.logo.oss.path=domain/fcb/
 oss.query.url=https://vr-web02-uat.fcb.com.cn/
 image.local.path=/image/
-inner.vr.scene.host=https://vr-web01-uat.fcb.com.cn/
+inner.vr.scene.host=https://vr-mc01-uat.fcb.com.cn/
 outer.vr.scene.host=https://vr-web01-uat.fcb.com.cn/
 vr.scene.link=hengda.html?m=

src/main/resources/application.properties

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