调整接口

fcb-project-application/src/main/resources/application.properties

@@ -1,10 +1,10 @@
 
 
 #spring.profiles.active=prod
-#spring.profiles.active=dev
+spring.profiles.active=dev
 #spring.profiles.active=uat
 #sit环境，这里使用了test因为sdk的swagger使用的是test,所以这里使用sit
-spring.profiles.active=test
+#spring.profiles.active=test
 
 #应用名
 spring.application.name=fbc-project-manager

fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/PanoInitSceneRsp.java

@@ -11,8 +11,8 @@ import java.io.Serializable;
  */
 
 @Data
-public class PanoInitSceneRsp implements Serializable {
-
+public class PanoInitSceneBean implements Serializable {
+    private static final long serialVersionUID=1L;
 
     /**
      * houseId : HUS000011356533501177094144
@@ -29,5 +29,6 @@ public class PanoInitSceneRsp implements Serializable {
     private String sceneCode;
     private String type;
     private String sceneTitle;
+    private String webSite;
 
 }

fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/PanoInitSceneTotalRsp.java

@@ -0,0 +1,19 @@
+package fcb.project.manager.base.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/3/23 15:51
+ * 4
+ */
+@Data
+public class PanoInitSceneTotalRsp implements Serializable {
+    private static final long serialVersionUID=1L;
+    private  Integer code;
+    private List<PanoInitSceneBean> data;
+    private String msg;
+}

fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmHouse.java

@@ -154,42 +154,5 @@ public class TmHouse implements Serializable {
     @ApiModelProperty(value = "用户在编辑后台编辑的模型的路径")
     private String vrPath;
 
-    @ApiModelProperty(value = "大场景场景码")
-    private String bigSceneNum;
-
-    @ApiModelProperty(value = "园林场景码")
-    private String gardensSceneNum;
-
-    @ApiModelProperty(value = "大场景内网链接")
-    private String bigInnerLink;
-
-    @ApiModelProperty(value = "大场景外网链接")
-    private String bigOuterLink;
-
-
-    @ApiModelProperty(value = "园林场景内网链接")
-    private String gardensInnerLink;
-
-    @ApiModelProperty(value = "园林场景外网链接")
-    private String gardensOuterLink;
-
-
-    @ApiModelProperty(value = "房源户型场景缩略图")
-    private String sceneCover;
-
-    @ApiModelProperty(value = "房源场景缩略图")
-    private String bigSceneCover;
-
-    @ApiModelProperty(value = "房源园林场景缩略图")
-    private String gardensCover;
-
-    @ApiModelProperty(value = "户型场景标题")
-    private String sceneTitle;
-
-    @ApiModelProperty(value = "大场景标题")
-    private String bigSceneTitle;
-
-    @ApiModelProperty(value = "园林场景标题")
-    private String gardensSceneTitle;
 
 }

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

@@ -3,10 +3,7 @@ package fcb.project.manager.base.service.custom;
 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.PanoInitSceneRsp;
-import fcb.project.manager.base.entity.PanoSceneBean;
-import fcb.project.manager.base.entity.SevenTwoZeroSceneRspBean;
+import fcb.project.manager.base.entity.*;
 import fcb.project.manager.core.feignInterfaces.PanoFeign;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
@@ -57,17 +54,19 @@ public class PanoService {
         return true;
     }
 
-    public List<PanoInitSceneRsp> getAllTypeSceneNums(String houseId, String token) {
+    public List<PanoInitSceneBean> getAllTypeSceneNums(String houseId, String token) {
         if (StringUtils.isBlank(houseId)) {
             return null;
         }
-        CommonRspBean rspBean = panoFeign.getAllTypeSceneNums(houseId , token);
+        PanoInitSceneTotalRsp rspBean = panoFeign.getAllTypeSceneNums(houseId , token);
         log.info("获取房源的初始化场景数据，从720返回结果:{}" , JSON.toJSONString(rspBean));
         if(null == rspBean || null == rspBean.getCode() || rspBean.getCode().compareTo(0) != 0){
             return null;
         }
-
-        return null != rspBean.getData() ? (List<PanoInitSceneRsp>) rspBean.getData() : null;
+        if(CollectionUtils.isEmpty(rspBean.getData())){
+            return null;
+        }
+        return rspBean.getData();
     }
 
     public List<String> getKanKanSceneNums(String houseId, String token) {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import fcb.project.manager.base.dao.TmHouseDao;
 import fcb.project.manager.base.entity.ContextTokenBean;
-import fcb.project.manager.base.entity.PanoInitSceneRsp;
+import fcb.project.manager.base.entity.PanoInitSceneBean;
 import fcb.project.manager.base.entity.TmEstate;
 import fcb.project.manager.base.entity.TmHouse;
 import fcb.project.manager.base.enums.DeleteStatus;
@@ -123,68 +123,6 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
         return resultPage;
     }
 
-    public TmHouse updateSceneInfo(List<PanoInitSceneRsp> sceneRspList , TmHouse tmHouse){
-        boolean needUpdate = false;
-        TmEstate tmEstate = tmEstateService.getById(tmHouse.getEstateId());
-        if(null == tmEstate){
-            throw new CommonBaseException(ResultCodeEnum.D101 , "楼盘不存在");
-        }
-        if(StringUtils.isBlank(tmEstate.getFcbEstateId())){
-            throw new CommonBaseException(ResultCodeEnum.D101 , "恒大楼盘ID为空，无法生成内外网链接");
-        }
-        String sceneLinkPath = "";
-        if(!CollectionUtils.isEmpty(sceneRspList)){
-            for ( PanoInitSceneRsp rsp : sceneRspList) {
-                if(StringUtils.equals("house" , rsp.getType())){
-                    //户型的场景信息
-                    if(!StringUtils.equals(rsp.getSceneCode() , tmHouse.getSceneNum())){
-                        needUpdate = true;
-                        tmHouse.setSceneNum(rsp.getSceneCode());
-                        tmHouse.setSceneTitle(rsp.getSceneTitle());
-                        tmHouse.setInnerVrLink(innerSceneVrHost + String.format(vrLinkPath , rsp.getSceneCode() , tmEstate.getFcbEstateId() , tmHouse.getId()));
-                        tmHouse.setVrLink(outerSceneVrHost + String.format(vrLinkPath , rsp.getSceneCode() , tmEstate.getFcbEstateId() , tmHouse.getId()));
-                    }
-                    if(!StringUtils.equals(rsp.getIcon() , tmHouse.getSceneCover())){
-                        needUpdate = true;
-                        tmHouse.setSceneCover(rsp.getIcon());
-                    }
-                }else if(StringUtils.equals("building" , rsp.getType())){
-                    //楼盘（大场景）的场景信息
-                    if(!StringUtils.equals(rsp.getSceneCode() , tmHouse.getBigSceneNum())){
-                        needUpdate = true;
-                        tmHouse.setBigSceneNum(rsp.getSceneCode());
-                        tmHouse.setBigSceneTitle(rsp.getSceneTitle());
-                        tmHouse.setBigInnerLink(innerSceneVrHost + String.format(vrLinkPath , rsp.getSceneCode() , tmEstate.getFcbEstateId() , tmHouse.getId()));
-                        tmHouse.setBigOuterLink(outerSceneVrHost + String.format(vrLinkPath , rsp.getSceneCode() , tmEstate.getFcbEstateId() , tmHouse.getId()));
-                    }
-                    if(!StringUtils.equals(rsp.getIcon() , tmHouse.getSceneCover())){
-                        needUpdate = true;
-                        tmHouse.setBigSceneCover(rsp.getIcon());
-                    }
-                }else if(StringUtils.equals("garden" , rsp.getType())){
-                    //园林类型场景信息
-                    if(!StringUtils.equals(rsp.getSceneCode() , tmHouse.getGardensSceneNum())){
-                        needUpdate = true;
-                        tmHouse.setGardensSceneNum(rsp.getSceneCode());
-                        tmHouse.setGardensSceneTitle(rsp.getSceneTitle());
-                        tmHouse.setGardensInnerLink(innerSceneVrHost + String.format(vrLinkPath , rsp.getSceneCode() , tmEstate.getFcbEstateId() , tmHouse.getId()));
-                        tmHouse.setGardensOuterLink(outerSceneVrHost + String.format(vrLinkPath , rsp.getSceneCode() , tmEstate.getFcbEstateId() , tmHouse.getId()));
-                    }
-                    if(!StringUtils.equals(rsp.getIcon() , tmHouse.getSceneCover())){
-                        needUpdate = true;
-                        tmHouse.setGardensCover(rsp.getIcon());
-                    }
-                }
-
-            }
-        }
-        if(needUpdate){
-            if(!updateHouse(tmHouse)){
-                return null;
-            }
-        }
-        return tmHouse;
-    }
 
     public List<TmHouse> getListByEstate(String estateId){
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();

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

@@ -164,33 +164,8 @@ public class HouseManagerController extends BaseController{
         if(null == tmHouse || tmHouse.getIsDelete().compareTo(1) == 0){
             return Result.failure("房源不存在");
         }
-        List<PanoInitSceneRsp> sceneRspList  = panoService.getAllTypeSceneNums(houseId , getToken());
-        tmHouse = tmHouseService.updateSceneInfo(sceneRspList , tmHouse);
-        if(null == tmHouse){
-            return Result.failure("获取场景分享链接失败");
-        }
-        Map<String , Object> resultMap = new HashMap<>();
-        //户型场景
-        resultMap.put("sceneNum" , tmHouse.getSceneNum());
-        resultMap.put("sceneCover" , tmHouse.getSceneCover());
-        resultMap.put("sceneTitle" , tmHouse.getSceneTitle());
-        resultMap.put("sceneInnerLink" , tmHouse.getInnerVrLink());
-        resultMap.put("sceneOuterLink" , tmHouse.getVrLink());
-
-        //园林场景
-        resultMap.put("gardensSceneNum" , tmHouse.getGardensSceneNum());
-        resultMap.put("gardensSceneCover" , tmHouse.getGardensCover());
-        resultMap.put("gardensSceneTitle" , tmHouse.getGardensSceneTitle());
-        resultMap.put("gardensSceneInnerLink" , tmHouse.getGardensInnerLink());
-        resultMap.put("gardensSceneOuterLink" , tmHouse.getGardensOuterLink());
-
-        //楼盘大场景场景
-        resultMap.put("bigSceneNum" , tmHouse.getBigSceneNum());
-        resultMap.put("bigSceneCover" , tmHouse.getBigSceneCover());
-        resultMap.put("bigSceneTitle" , tmHouse.getBigSceneTitle());
-        resultMap.put("bigSceneInnerLink" , tmHouse.getBigInnerLink());
-        resultMap.put("bigSceneOuterLink" , tmHouse.getBigOuterLink());
-        return Result.success(resultMap);
+        List<PanoInitSceneBean> sceneRspList  = panoService.getAllTypeSceneNums(houseId , getToken());
+        return Result.success(sceneRspList);
     }
 
     @GetMapping("/getQrImage")

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

@@ -1,6 +1,7 @@
 package fcb.project.manager.core.feignInterfaces;
 
 import fcb.project.manager.base.entity.CommonRspBean;
+import fcb.project.manager.base.entity.PanoInitSceneTotalRsp;
 import fcb.project.manager.base.entity.SevenTwoZeroSceneRspBean;
 import fcb.project.manager.core.feignInterfaces.fallBack.PanoFeignFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -33,6 +34,6 @@ public interface PanoFeign {
     public CommonRspBean getOneVrlink(@PathVariable String houseId , @RequestHeader(name = "token") String token);
 
     @GetMapping("/fcb/pano/init/list/{houseId}")
-    public CommonRspBean getAllTypeSceneNums(@PathVariable String houseId , @RequestHeader(name = "token") String token);
+    public PanoInitSceneTotalRsp getAllTypeSceneNums(@PathVariable String houseId , @RequestHeader(name = "token") String token);
 
 }

fcb-project-manager-core/src/main/java/fcb/project/manager/core/feignInterfaces/fallBack/PanoFeignFallBack.java

@@ -1,6 +1,7 @@
 package fcb.project.manager.core.feignInterfaces.fallBack;
 
 import fcb.project.manager.base.entity.CommonRspBean;
+import fcb.project.manager.base.entity.PanoInitSceneTotalRsp;
 import fcb.project.manager.base.entity.SevenTwoZeroSceneRspBean;
 import fcb.project.manager.core.feignInterfaces.PanoFeign;
 import org.springframework.stereotype.Component;
@@ -55,8 +56,8 @@ public class PanoFeignFallBack implements PanoFeign {
     }
 
     @Override
-    public CommonRspBean getAllTypeSceneNums(String houseId, String token) {
-        CommonRspBean commonRspBean = new CommonRspBean();
+    public PanoInitSceneTotalRsp getAllTypeSceneNums(String houseId, String token) {
+        PanoInitSceneTotalRsp commonRspBean = new PanoInitSceneTotalRsp();
         commonRspBean.setMsg("服务超时");
         commonRspBean.setCode(-1);
         return commonRspBean;