更新:

    只有房源编辑接口需要把VR项目信息更新到管理后台， 其他三类场景保存结果都不需要更新场景码过去

cms_pano_fcb/gis_application/src/main/resources/application-dev.properties

@@ -84,8 +84,8 @@ oss.file.path=${project.name}/
 oss.domain=http://ossxiaoan.4dage.com/
 
 swagger.package=com.gis.web.controller
-swagger.title=VR720-fcb dev
-swagger.description==VR720-fcb dev
+swagger.title=fcb dev
+swagger.description=fcb dev
 swagger.version=1.0
 
 

cms_pano_fcb/gis_application/src/main/resources/application-pro.properties

@@ -69,8 +69,8 @@ oss.file.path=${project.name}/
 oss.domain=https://vr-oss01.fcb.com.cn/
 
 swagger.package=com.gis.web.controller
-swagger.title=VR720¡ªfcb pro 
-swagger.description=VR720¡ªpro 
+swagger.title=fcb pro 
+swagger.description=fcb¡ªpro 
 swagger.version=1.0
 
 

cms_pano_fcb/gis_application/src/main/resources/application-sit.properties

@@ -78,8 +78,8 @@ oss.file.path=${project.name}/
 oss.domain=https://oss-xiaoan.oss-cn-shenzhen.aliyuncs.com/
 
 swagger.package=com.gis.web.controller
-swagger.title=VR720-fcb sit
-swagger.description==VR720-fcb sit
+swagger.title=fcb sit
+swagger.description=fcb sit
 swagger.version=1.0
 
 

cms_pano_fcb/gis_application/src/main/resources/application-uat.properties

@@ -72,8 +72,8 @@ oss.domain=https://vr-web02-uat.fcb.com.cn/
 
 
 swagger.package=com.gis.web.controller
-swagger.title=VR720-fcb uat
-swagger.description==VR720-fcb uat
+swagger.title=fcb uat
+swagger.description=fcb uat
 swagger.version=1.0
 
 

cms_pano_fcb/gis_domain/src/main/java/com/gis/domain/dto/EditHouseDto.java

@@ -28,6 +28,9 @@ public class EditHouseDto {
     @ApiModelProperty(value = "房源-封面图（初始画面）")
     private String houseIcon;
 
+    @ApiModelProperty(value = "恒大Id")
+    private String fcbHouseId;
+
 //    @ApiModelProperty(value = "场景-someData")
 //    private String someData;
 

cms_pano_fcb/gis_domain/src/main/java/com/gis/domain/dto/HouseDto.java

@@ -38,6 +38,9 @@ public class HouseDto {
     @ApiModelProperty(value = "是否展示 ， 1：展示")
     private String isShow;
 
+    @ApiModelProperty(value = "恒大Id")
+    private String fcbHouseId;
+
 //    @ApiModelProperty(value = "场景码")
 //    private String sceneNum;
 

cms_pano_fcb/gis_service/src/main/java/com/gis/service/HouseService.java

@@ -1,6 +1,7 @@
 package com.gis.service;
 
 import com.gis.common.util.Result;
+import com.gis.domain.dto.EditHouseDto;
 
 /**
  * Created by owen on 2020/3/11 0011 16:14
@@ -9,4 +10,6 @@ public interface HouseService  {
 
 
     Result checkStatus(String houseId, String status);
+
+    Result editHouse(EditHouseDto param);
 }

cms_pano_fcb/gis_service/src/main/java/com/gis/service/SceneService.java

@@ -20,7 +20,7 @@ public interface SceneService extends IBaseService<SceneEntity, String> {
 
     Result search(ScenePageDto param);
 
-    Result editHouse(EditHouseDto param);
+//    Result editHouse(EditHouseDto param);
 
     Result findVrModel(SceneRroPageDto param);
 

cms_pano_fcb/gis_service/src/main/java/com/gis/service/impl/HouseServiceImpl.java

@@ -1,6 +1,10 @@
 package com.gis.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.gis.common.util.Result;
+import com.gis.domain.dto.EditHouseDto;
+import com.gis.domain.dto.HouseDto;
 import com.gis.domain.entity.SceneEntity;
 import com.gis.feign.HouseFeign;
 import com.gis.mapper.SceneMapper;
@@ -9,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 
@@ -38,4 +43,88 @@ public class HouseServiceImpl implements HouseService {
         log.info("是否有计算中的场景： " + flag);
         return Result.success(flag);
     }
+
+    /**
+     * 编辑场景
+     * house字段更新伟玉房源接口
+     * 其他字段更新720场景数据，websit要更新到伟玉那边去
+     */
+    @Override
+    public Result editHouse(EditHouseDto param) {
+
+        // 检查VR项目状态
+        String houseId = param.getHouseId();
+        Result resStatus =  getHouseStatus(houseId);
+        if (resStatus != null) {
+            return resStatus;
+        }
+
+        // TODO: 2021/1/8 0008 更新伟玉房源表单接口
+        HouseDto houseDto = new HouseDto();
+        houseDto.setId(houseId);
+        houseDto.setCoverImagUrl(param.getHouseIcon());
+        houseDto.setHouseTitle(param.getHouseTitle());
+        houseDto.setShareDesc(param.getHouseDescription());
+        houseDto.setUpdateTime(LocalDateTime.now());
+        // 2021-03-30 新增
+        houseDto.setFcbHouseId(param.getFcbHouseId());
+        // 设置为显示
+        houseDto.setIsShow("1");
+
+        log.info("update houseDto: " + houseDto.toString());
+
+        try {
+            Result result = houseFeign.updateHouse(houseDto);
+            if (result.getCode() == 0) {
+                log.info("更新房源信息完成");
+            } else {
+                log.error("更新房源信息异常");
+                return Result.failure(result.getMsg());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return Result.success();
+    }
+
+    /**
+     * 查询VR项目状态
+     * @param houseId
+     * @return
+     */
+    private Result getHouseStatus(String houseId){
+        Result result = null;
+        try {
+            result = houseFeign.findByHouseId(houseId);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        String status = null;
+        if (result.getCode() == 0) {
+            Object data = result.getData();
+            JSONObject jsonObject = JSON.parseObject(data.toString());
+            status = jsonObject.getString("status");
+            log.info("house status: " + status);
+            log.warn("可以正常编辑");
+            if (status.equals("1")) {
+                log.warn("审核中不能编辑");
+                return Result.failure(7005, "审核中不能编辑");
+            }
+            if (status.equals("2")) {
+                log.warn("已审核中不能编辑");
+                return Result.failure(7006, "已审核中不能编辑");
+            }
+
+
+        }
+
+        if (result.getCode() == -1){
+            log.error("VR项目接口查询失败:" + result.getMsg() );
+            return Result.failure(7007, "VR项目接口查询失败");
+        }
+
+        return null;
+    }
+
 }

cms_pano_fcb/gis_service/src/main/java/com/gis/service/impl/SceneServiceImpl.java

@@ -177,25 +177,25 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
             log.info("webSite: " + webSite);
             entity.setWebSite(webSite);
 
-                log.info("更新hengdaId到管理后台");
-                // 更新到VR项目
-                HouseSceneIndexDto houseSceneIndexDto = new HouseSceneIndexDto();
-                houseSceneIndexDto.setId(houseId);
-                houseSceneIndexDto.setSceneNum(entity.getSceneCode());
-                houseSceneIndexDto.setUpdateTime(LocalDateTime.now());
-                houseSceneIndexDto.setFcbHouseId(hengdaId);
-                Result result = houseFeign.updateHouseSceneIndex(houseSceneIndexDto);
-
-
-                if (result.getCode() == 0) {
-                    log.info("新场景码到VR项目完成");
-                } else {
-                    log.error("新场景码到VR项目异常");
-                    return Result.failure(result.getMsg());
-                }
-                log.info("result: " + result.toString());
-
-                log.info("更新初始场景到VR项目完成");
+//                log.info("更新hengdaId到管理后台");
+//                // 更新到VR项目
+//                HouseSceneIndexDto houseSceneIndexDto = new HouseSceneIndexDto();
+//                houseSceneIndexDto.setId(houseId);
+//                houseSceneIndexDto.setSceneNum(entity.getSceneCode());
+//                houseSceneIndexDto.setUpdateTime(LocalDateTime.now());
+//                houseSceneIndexDto.setFcbHouseId(hengdaId);
+//                Result result = houseFeign.updateHouseSceneIndex(houseSceneIndexDto);
+//
+//
+//                if (result.getCode() == 0) {
+//                    log.info("新场景码到VR项目完成");
+//                } else {
+//                    log.error("新场景码到VR项目异常");
+//                    return Result.failure(result.getMsg());
+//                }
+//                log.info("result: " + result.toString());
+//
+//                log.info("更新初始场景到VR项目完成");
 
 
             this.save(entity);
@@ -365,6 +365,7 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
 
 
             BeanUtils.copyProperties(param, entity);
+            // 2021-03-30 更新pro, 不更新场景码到恒大后台
 //            if (index.size() == 0) {
 //                entity.setIsIndex(1);
 
@@ -450,49 +451,49 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
         return flag;
     }
 
-    /**
-     * 编辑场景
-     * house字段更新伟玉房源接口
-     * 其他字段更新720场景数据，websit要更新到伟玉那边去
-     */
-    @Override
-    public Result editHouse(EditHouseDto param) {
-
-        // 检查VR项目状态
-        String houseId = param.getHouseId();
-        Result resStatus =  getHouseStatus(houseId);
-        if (resStatus != null) {
-            return resStatus;
-        }
-
-        // TODO: 2021/1/8 0008 更新伟玉房源表单接口
-        HouseDto houseDto = new HouseDto();
-        houseDto.setId(houseId);
-        houseDto.setCoverImagUrl(param.getHouseIcon());
-        houseDto.setHouseTitle(param.getHouseTitle());
-        houseDto.setShareDesc(param.getHouseDescription());
-        houseDto.setUpdateTime(LocalDateTime.now());
-        // 设置为显示
-        houseDto.setIsShow("1");
-
-        log.info("update houseDto: " + houseDto.toString());
-
-        try {
-            Result result = houseFeign.updateHouse(houseDto);
-            if (result.getCode() == 0) {
-                log.info("更新房源信息完成");
-            } else {
-                log.error("更新房源信息异常");
-                return Result.failure(result.getMsg());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        log.info("更新房源vr项目完成");
-
-        return Result.success();
-    }
+//    /**
+//     * 编辑场景
+//     * house字段更新伟玉房源接口
+//     * 其他字段更新720场景数据，websit要更新到伟玉那边去
+//     */
+//    @Override
+//    public Result editHouse(EditHouseDto param) {
+//
+//        // 检查VR项目状态
+//        String houseId = param.getHouseId();
+//        Result resStatus =  getHouseStatus(houseId);
+//        if (resStatus != null) {
+//            return resStatus;
+//        }
+//
+//        // TODO: 2021/1/8 0008 更新伟玉房源表单接口
+//        HouseDto houseDto = new HouseDto();
+//        houseDto.setId(houseId);
+//        houseDto.setCoverImagUrl(param.getHouseIcon());
+//        houseDto.setHouseTitle(param.getHouseTitle());
+//        houseDto.setShareDesc(param.getHouseDescription());
+//        houseDto.setUpdateTime(LocalDateTime.now());
+//        // 2021-03-30 新增
+//        houseDto.setFcbHouseId(param.getFcbHouseId());
+//        // 设置为显示
+//        houseDto.setIsShow("1");
+//
+//        log.info("update houseDto: " + houseDto.toString());
+//
+//        try {
+//            Result result = houseFeign.updateHouse(houseDto);
+//            if (result.getCode() == 0) {
+//                log.info("更新房源信息完成");
+//            } else {
+//                log.error("更新房源信息异常");
+//                return Result.failure(result.getMsg());
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//
+//        return Result.success();
+//    }
 
 
     @Override
@@ -795,25 +796,25 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
 //            if (index.size() == 0) {
 //                entity.setIsIndex(1);
 
-                HouseSceneIndexDto indexDto = new HouseSceneIndexDto();
-                indexDto.setId(entity.getHouseId());
-                indexDto.setSceneNum(entity.getSceneCode());
-                indexDto.setUpdateTime(LocalDateTime.now());
-                // 恒大id必须更新到管理后台 2021-03-08
-                indexDto.setFcbHouseId(entity.getHengdaId());
-                Result result = null;
-                try {
-                    result = houseFeign.updateHouseSceneIndex(indexDto);
-
-                    if (result.getCode() == 0) {
-                        log.info("更新了初始场景到VR项目完成");
-                    } else {
-                        log.error("更新了初始场景到VR项目异常");
-                        return Result.failure(result.getMsg());
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+//                HouseSceneIndexDto indexDto = new HouseSceneIndexDto();
+//                indexDto.setId(entity.getHouseId());
+//                indexDto.setSceneNum(entity.getSceneCode());
+//                indexDto.setUpdateTime(LocalDateTime.now());
+//                // 恒大id必须更新到管理后台 2021-03-08
+//                indexDto.setFcbHouseId(entity.getHengdaId());
+//                Result result = null;
+//                try {
+//                    result = houseFeign.updateHouseSceneIndex(indexDto);
+//
+//                    if (result.getCode() == 0) {
+//                        log.info("更新了初始场景到VR项目完成");
+//                    } else {
+//                        log.error("更新了初始场景到VR项目异常");
+//                        return Result.failure(result.getMsg());
+//                    }
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
 
 
 //            }

cms_pano_fcb/gis_web/src/main/java/com/gis/web/controller/HouseController.java

@@ -56,6 +56,14 @@ public class HouseController extends BaseController {
     }
 
 
+    @WebControllerLog(description = "编辑VR项目")
+    @ApiOperation(value = "VR项目修改", position = 3, notes = "修改VR项目的基础信息")
+    @PostMapping("edit")
+    public Result editHouse(@Valid @RequestBody EditHouseDto param) {
+        return houseService.editHouse(param);
+    }
+
+
 
 
 

cms_pano_fcb/gis_web/src/main/java/com/gis/web/controller/SceneController.java

@@ -27,6 +27,8 @@ import java.util.Map;
 
 /**
  * Created by owen on 2020/2/18 0018 12:17
+ *
+ * 新增全景图、VR模型，都需要把场景码更新到恒大管理后台tm_house
  */
 @Log4j2
 @Api(tags = "场景管理")
@@ -120,12 +122,12 @@ public class SceneController extends BaseController {
 //        return sceneService.uploadFixedName(file, sceneCode);
 //    }
 
-    @WebControllerLog(description = "VR项目-编辑VR项目")
-    @ApiOperation(value = "VR项目修改", position = 3, notes = "修改VR项目的基础信息")
-    @PostMapping("house/edit")
-    public Result editHouse(@Valid @RequestBody EditHouseDto param) {
-        return sceneService.editHouse(param);
-    }
+//    @WebControllerLog(description = "VR项目-编辑VR项目")
+//    @ApiOperation(value = "VR项目修改", position = 3, notes = "修改VR项目的基础信息")
+//    @PostMapping("house/edit")
+//    public Result editHouse(@Valid @RequestBody EditHouseDto param) {
+//        return sceneService.editHouse(param);
+//    }
 
     /**
      * 提供恒大管理后台使用

cms_pano_fcb/remark.md

@@ -175,6 +175,9 @@ sit:
     20210322
         新增：初始画面-上传接口，作用封面图统一 全景图缩略图统一命名规则： http:// oss/cms_pano_fcb/image/thumb_sceneCode.jpg
         新增：初始场景管理模块，提供管理后台初始场景列表  （新的是三个初始场景，是否需要兼容旧数据？？ 需要兼容旧数据）
+        
+    20210330
+        只有房源编辑接口需要把VR项目信息更新到管理后台， 其他三类场景保存结果都不需要更新场景码过去   
            
     
 # uat 更新日志