更新:

    注释不使用的方法

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

@@ -157,11 +157,9 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
 
             // 缩略图，使用切图那个thumb.jpg
             // 压缩图片并上传oss
-//            String iconPath = fileUtils.compressImgAndUploadOss2(panoPath, configConstant.ossBasePath, configConstant.ossDomain);
             // 全景图缩略图统一命名规则： http:// oss/cms_pano_fcb/image/thumb_sceneCode.jpg
             String iconPath = fileUtils.compressImgAndUploadOss2(
                     panoPath, configConstant.filePath, configConstant.ossBasePath, configConstant.ossDomain, 600, 300, "image/thumb_"+sceneCode+".jpg");
-//            String iconPath = fileUtils.compressImgAndUploadOss(panoPath, configConstant.ossBasePath, configConstant.ossDomain);
             log.info("iconPath：" + iconPath);
             entity.setIcon(iconPath);
             entity.setStatus(1);
@@ -179,13 +177,7 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
             log.info("webSite: " + webSite);
             entity.setWebSite(webSite);
 
-            // 设置初始场景
-//            SceneEntity index = entityMapper.getIndex(houseId);
-            List<SceneEntity> index = entityMapper.getIndex(houseId);
-            if (index.size() == 0) {
                 log.info("更新hengdaId到管理后台");
-                entity.setIsIndex(1);
-
                 // 更新到VR项目
                 HouseSceneIndexDto houseSceneIndexDto = new HouseSceneIndexDto();
                 houseSceneIndexDto.setId(houseId);
@@ -194,12 +186,6 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
                 houseSceneIndexDto.setFcbHouseId(hengdaId);
                 Result result = houseFeign.updateHouseSceneIndex(houseSceneIndexDto);
 
-//                JSONObject jsonObject = new JSONObject();
-//                jsonObject.put("id", houseId);
-//                jsonObject.put("sceneNum", houseId);
-//                jsonObject.put("updateTime", houseId);
-//                jsonObject.put("fcbHouseId", houseId);
-//                jsonObject.put("id", houseId);
 
                 if (result.getCode() == 0) {
                     log.info("新场景码到VR项目完成");
@@ -210,16 +196,14 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
                 log.info("result: " + result.toString());
 
                 log.info("更新初始场景到VR项目完成");
-            }
+
 
             this.save(entity);
 
             //发消息到mq
             rabbitTemplate.convertAndSend(RabbitConfig.PANO_EXCHANGE, RabbitConfig.PANO_QUEUE_ROUTING, entity.getId());
 
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (Exception e) {
+        }  catch (Exception e) {
             e.printStackTrace();
         }
 
@@ -364,7 +348,7 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
 
         SceneEntity entity = null;
 
-        List<SceneEntity> index = entityMapper.getIndex(param.getHouseId());
+//        List<SceneEntity> index = entityMapper.getIndex(param.getHouseId());
 
         if ( id == null) {
             entity = entityMapper.findByVrModelIdAndHouseId(param.getVrModelId(), param.getHouseId());
@@ -381,8 +365,8 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
 
 
             BeanUtils.copyProperties(param, entity);
-            if (index.size() == 0) {
-                entity.setIsIndex(1);
+//            if (index.size() == 0) {
+//                entity.setIsIndex(1);
 
 //                HouseSceneIndexDto indexDto = new HouseSceneIndexDto();
 //                indexDto.setId(entity.getHouseId());
@@ -397,7 +381,7 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
 //                    log.error("更新了初始场景到VR项目异常");
 //                    return Result.failure(result.getMsg());
 //                }
-            }
+//            }
             entity.setId(RandomUtils.getUuid());
             entity.setType("house");
             entity.setStatus(3);
@@ -779,7 +763,7 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
 
         SceneEntity entity = null;
 
-        List<SceneEntity> index = entityMapper.getIndex(param.getHouseId());
+//        List<SceneEntity> index = entityMapper.getIndex(param.getHouseId());
 
         if ( id == null) {
              entity = entityMapper.findByVrModelIdAndHouseId(param.getVrModelId(), param.getHouseId());
@@ -796,8 +780,8 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
 
 
             BeanUtils.copyProperties(param, entity);
-            if (index.size() == 0) {
-                entity.setIsIndex(1);
+//            if (index.size() == 0) {
+//                entity.setIsIndex(1);
 
                 HouseSceneIndexDto indexDto = new HouseSceneIndexDto();
                 indexDto.setId(entity.getHouseId());
@@ -820,7 +804,7 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
                 }
 
 
-            }
+//            }
             entity.setId(RandomUtils.getUuid());
             entity.setType("house");
             entity.setStatus(3);

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

@@ -165,21 +165,21 @@ public class SceneController extends BaseController {
      * @param houseId
      * @return
      */
-    @ApiOperation(value = "首页获取", position = 3)
-    @GetMapping("getIndex/{houseId}")
-    public Result getIndex(@PathVariable String houseId) {
-        return sceneService.getIndex(houseId);
-    }
+//    @ApiOperation(value = "首页获取", position = 3)
+//    @GetMapping("getIndex/{houseId}")
+//    public Result getIndex(@PathVariable String houseId) {
+//        return sceneService.getIndex(houseId);
+//    }
 
     /**
      * 2021-03-18 估计不用
      * @return
      */
-    @ApiOperation(value = "首页设置", position = 3)
-    @PostMapping("setIndex/{id}")
-    public Result setIndex(@PathVariable String id) {
-        return sceneService.setIndex(id);
-    }
+//    @ApiOperation(value = "首页设置", position = 3)
+//    @PostMapping("setIndex/{id}")
+//    public Result setIndex(@PathVariable String id) {
+//        return sceneService.setIndex(id);
+//    }
 
 
     /**
@@ -223,6 +223,7 @@ public class SceneController extends BaseController {
 
     /**
      * 提供恒大管理后台使用
+     * 2021-3-24 估计这个方法不用
      */
     @ApiOperation(value = "房源首页批量获取", position = 3, notes = "获取所有VR项目的首页场景链接")
     @PostMapping("house/findAllHouseId")
@@ -342,7 +343,7 @@ public class SceneController extends BaseController {
 
         entity.setIsDelete(1);
         // 设置场景为0
-        entity.setIsIndex(0);
+//        entity.setIsIndex(0);
         entity.setUpdateTime(new Date());
 
         sceneService.update(entity);
@@ -398,15 +399,15 @@ public class SceneController extends BaseController {
     }
 
 
-    private SceneEntity setInitIndex(List<SceneEntity> entityList) {
-
-        SceneEntity sceneEntity = entityList.get(0);
-        if (sceneEntity != null) {
-            sceneEntity.setIsIndex(1);
-            sceneService.update(sceneEntity);
-        }
-        return sceneEntity;
-    }
+//    private SceneEntity setInitIndex(List<SceneEntity> entityList) {
+//
+//        SceneEntity sceneEntity = entityList.get(0);
+//        if (sceneEntity != null) {
+//            sceneEntity.setIsIndex(1);
+//            sceneService.update(sceneEntity);
+//        }
+//        return sceneEntity;
+//    }
 
     /**
      * 这个接口，好像是没用的

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

@@ -290,24 +290,24 @@ public class TestController extends BaseController {
 //    }
 
 
-    @ApiOperation("获取Result")
-    @PostMapping("getResult/{houseId}")
-    public Result testResult(@PathVariable String houseId ){
-        Result result = sceneService.getIndex(houseId);
-        if (result.getCode() == 0) {
-            log.info("result:" + result);
-            log.info("正常");
-//            String data = (String)result.getData();
-
-
-//            JSONObject jsonObject = JSONObject.parseObject(data);
-        } else {
-            log.info("异常");
-            log.info("msg: {}" + result.getMsg());
-        }
-
-        return result;
-    }
+//    @ApiOperation("获取Result")
+//    @PostMapping("getResult/{houseId}")
+//    public Result testResult(@PathVariable String houseId ){
+//        Result result = sceneService.getIndex(houseId);
+//        if (result.getCode() == 0) {
+//            log.info("result:" + result);
+//            log.info("正常");
+////            String data = (String)result.getData();
+//
+//
+////            JSONObject jsonObject = JSONObject.parseObject(data);
+//        } else {
+//            log.info("异常");
+//            log.info("msg: {}" + result.getMsg());
+//        }
+//
+//        return result;
+//    }
 
     /**
      * 测试正常
@@ -409,11 +409,11 @@ public class TestController extends BaseController {
 
     }
 
-    @ApiOperation(value = "VR模型查找", position = 3)
-    @PostMapping("findVrModel")
-    public Result findVrModel(@Valid @RequestBody SceneRroPageDto param) {
-        return sceneService.findVrModel2(param);
-    }
+//    @ApiOperation(value = "VR模型查找", position = 3)
+//    @PostMapping("findVrModel")
+//    public Result findVrModel(@Valid @RequestBody SceneRroPageDto param) {
+//        return sceneService.findVrModel2(param);
+//    }
 
     @ApiOperation(value = "房源首页获取", position = 3)
     @PostMapping("findAllHouseId")

cms_pano_fcb/remark.md

@@ -144,6 +144,9 @@ sit:
    // VR项目表
    select id, house_title from tb_scene where is_delete=0 and id='' \G;
    
+   // 旧数据-初始场景
+   select id,house_id,scene_title,is_delete,is_index,scene_code from tb_scene where is_delete=0 and house_id='HUS000011362697060370046976' and is_index=1;
+   
    web: 
    https://vr-web01-uat.fcb.com.cn/evergrande/#/login
     https://vr-web01-uat.fcb.com.cn/
@@ -170,7 +173,7 @@ sit:
 # sit 更新日志
     20210322
         新增：初始画面-上传接口，作用封面图统一 全景图缩略图统一命名规则： http:// oss/cms_pano_fcb/image/thumb_sceneCode.jpg
-        新增：初始场景管理模块，提供管理后台初始场景列表  （新的是三个初始场景，是否需要兼容旧数据？？）
+        新增：初始场景管理模块，提供管理后台初始场景列表  （新的是三个初始场景，是否需要兼容旧数据？？ 需要兼容旧数据）
            
     
 # uat 更新日志