二手房功能

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

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

cms_pano_fcb/gis_application/src/main/resources/db/tb_second_hand.sql

@@ -0,0 +1,55 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 8.135.98.231_fcb_sit
+ Source Server Type    : MySQL
+ Source Server Version : 50732
+ Source Host           : 8.135.98.231:3306
+ Source Schema         : cms_pano_fcb
+
+ Target Server Type    : MySQL
+ Target Server Version : 50732
+ File Encoding         : 65001
+
+ Date: 13/09/2021 14:12:14
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for tb_second_hand
+-- ----------------------------
+DROP TABLE IF EXISTS `tb_second_hand`;
+CREATE TABLE `tb_second_hand`  (
+  `id` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '分布式id',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `is_delete` int(2) NULL DEFAULT 0 COMMENT '0代表未删除 ， 1代表已经删除，默认写0',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `scene_code` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '场景码',
+  `house_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '楼盘id（VR项目id）',
+  `type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类型, 楼盘:building， 园林：garden, 户型：house',
+  `by_type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '当type=house && byType=garden : 类型为售楼部,数据显示在园林全景里',
+  `status` int(2) NULL DEFAULT NULL COMMENT '状态 1：切图中， 2：失败， 3：完成',
+  `scene_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '场景名称',
+  `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件保存地址',
+  `web_site` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '场景url',
+  `oss_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'oss存放地址',
+  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '简介',
+  `file_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件名',
+  `icon` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '封面图',
+  `create_user_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `some_data` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'someData数据',
+  `is_index` int(3) NULL DEFAULT 0 COMMENT '初始场景，0：否， 1：是（排第一）',
+  `room_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '样版间名称',
+  `room_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '恒大样本间id',
+  `vr_model_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'vrModelId（四维看看场景id）',
+  `hengda_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '恒大Id',
+  `sort` int(11) NULL DEFAULT 100 COMMENT '排序',
+  `init_visual` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '初始视觉',
+  `use_hots` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '热点关联场景, 场景码，允许多个以逗号隔开',
+  `agent_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '恒大经纪人id(讲房顾问), 只有在house类型才有此数据',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '二手房场景表' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;

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

@@ -25,4 +25,9 @@ public class SceneRroPageDto extends PageDto {
     @ApiModelProperty(value = "查找场景名称")
     private String sceneName;
 
+//    // 2021-09-10
+//    @ApiModelProperty(value = "场景类型", notes = "6:二手房，如果不传，就是新房")
+//    private Integer sceneType;
+
+
 }

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

@@ -12,4 +12,7 @@ public class SecondHandPageDto extends PageDto {
     @ApiModelProperty(value = "houseId", required = true)
     private String houseId;
 
+    @ApiModelProperty(value = "status", notes = "web：需要传3：, 返回说有数据不用传")
+    private Integer status;
+
 }

cms_pano_fcb/gis_mapper/src/main/java/com/gis/mapper/provider/SecondHandProvider.java

@@ -26,9 +26,9 @@ public class SecondHandProvider {
         }
 
 
-        String status = "3";
-        // 传3 过来，会把审核：4、未审核：3的都传给前端
-        if(StringUtils.isNotBlank(status)){
+        Integer status = param.getStatus();
+        //  web端传过来， 传3 过来，会把审核：4、未审核：3的都传给前端
+        if(status != null){
             sql.append(" and ( status >= '").append(status).append("' )");
         }
 

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

@@ -198,6 +198,22 @@ public class SecondHandServiceImpl extends IBaseServiceImpl<SecondHandEntity, St
         return Result.success(entity);
     }
 
+
+    @Override
+    public JSONObject jsonSearch(SecondHandPageDto param) {
+        startPage(param);
+        List<SecondHandEntity> search = entityMapper.search(param);
+        PageInfo<SecondHandEntity> page = new PageInfo<>(search);
+
+        JSONObject result = new JSONObject();
+        result.put("code", 0);
+        result.put("data", page);
+        result.put("msg", "操作成功");
+        // 是否存在计算中的场景， true: 需要轮询， false:不轮询
+        result.put("isCheck", checkStatus(param.getHouseId(), "1"));
+        return result;
+    }
+
     @Override
     public Result testQueueSecondHand() {
         String msg = "cms_pano_fcb/image/thumb_sceneCode.jpg_" + System.currentTimeMillis();
@@ -321,20 +337,7 @@ public class SecondHandServiceImpl extends IBaseServiceImpl<SecondHandEntity, St
         return Result.success(fileUtils.renameUploadOssBye(file, configConstant.ossBasePath + "secondHand/", configConstant.ossDomain));
     }
 
-    @Override
-    public JSONObject jsonSearch(SecondHandPageDto param) {
-        startPage(param);
-        List<SecondHandEntity> search = entityMapper.search(param);
-        PageInfo<SecondHandEntity> page = new PageInfo<>(search);
 
-        JSONObject result = new JSONObject();
-        result.put("code", 0);
-        result.put("data", page);
-        result.put("msg", "操作成功");
-        // 是否存在计算中的场景， true: 需要轮询， false:不轮询
-        result.put("isCheck", checkStatus(param.getHouseId(), "1"));
-        return result;
-    }
 
 
     @Override
@@ -456,7 +459,7 @@ public class SecondHandServiceImpl extends IBaseServiceImpl<SecondHandEntity, St
             PageInfo page = JSON.parseObject(data.toString(), PageInfo.class);
 
             List<Object> list = page.getList();
-            log.info("list size: " + list.size());
+            log.info("四维看看返回场景数量: " + list.size());
 
             List<Object> newList = new ArrayList<>();
 
@@ -619,7 +622,7 @@ public class SecondHandServiceImpl extends IBaseServiceImpl<SecondHandEntity, St
     private boolean canEdit(String houseId) {
         Result result = null;
         // 方便测试用， 可以删除
-        if ("dev".equals(configConstant.active) || "sit".equals(configConstant.active)) {
+        if ("dev".equals(configConstant.active) || "sit".equals(configConstant.active) || "fcbsit".equals(configConstant.active)) {
             return true;
         }
         try {
@@ -649,33 +652,6 @@ public class SecondHandServiceImpl extends IBaseServiceImpl<SecondHandEntity, St
     }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     @Override
     public void startPage(PageDto param) {
         super.startPage(param);

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

@@ -32,6 +32,19 @@ public class SecondHandController {
     @Autowired
     SecondHandService secondHandService;
 
+
+    /**
+     * 改VR项目有计算中的模型，允许轮询，否则停止轮询
+     * 30s 轮询一次
+     * VR项目有计算中的模型，(true)允许轮询，(false)否则停止轮询
+     */
+    @ApiOperation(value = "场景列表", position = 1, notes = "30s轮询一次,VR项目有计算中的模型，(true)允许轮询，(false)否则停止轮询")
+    @PostMapping("list")
+    public JSONObject list(@RequestBody SecondHandPageDto param) {
+        return secondHandService.jsonSearch(param);
+    }
+
+
     /**
      * 创建场景
      *
@@ -45,16 +58,7 @@ public class SecondHandController {
     }
 
 
-    /**
-     * 改VR项目有计算中的模型，允许轮询，否则停止轮询
-     * 30s 轮询一次
-     * VR项目有计算中的模型，(true)允许轮询，(false)否则停止轮询
-     */
-    @ApiOperation(value = "场景列表", position = 1, notes = "30s轮询一次,VR项目有计算中的模型，(true)允许轮询，(false)否则停止轮询")
-    @PostMapping("list")
-    public JSONObject list(@RequestBody SecondHandPageDto param) {
-        return secondHandService.jsonSearch(param);
-    }
+
 
     @WebControllerLog(description = "二手房管理-更新初始画面")
     @ApiOperation("更新初始画面")
@@ -139,8 +143,8 @@ public class SecondHandController {
      * @return
      */
     @WebControllerLog(description = "二手房管理-调用四维看看VR模型查找")
-    @ApiOperation(value = "VR模型查找", position = 3, notes = "获取四维看看计算成功的场景信息")
-    @PostMapping("findVrModel")
+    @ApiOperation(value = "fdkk-VR模型查找", notes = "获取四维看看计算成功的场景信息,四维看看目前不区分二手房场景")
+    @PostMapping("fdkk/findVrModel")
     public Result findVrModel(@Valid @RequestBody SceneRroPageDto param) {
         return secondHandService.findVrModel(param);
     }
@@ -152,7 +156,7 @@ public class SecondHandController {
      * @return
      */
     @WebControllerLog(description = "二手房管理-VR项目删除")
-    @ApiOperation(value = "VR项目删除", position = 3, notes = "管理后台删除VR项目时，把相应场景设置为删除状态")
+    @ApiOperation(value = "house-VR项目删除", notes = "管理后台删除VR项目时，把相应场景设置为删除状态")
     @GetMapping("house/remove/{houseId}")
     public Result houseRemove(@PathVariable String houseId) {
         return secondHandService.houseRemove(houseId);
@@ -171,7 +175,7 @@ public class SecondHandController {
             @ApiImplicitParam(name = "status", value = "状态， 审核通过/上线:4， 下线：3", dataType = "String"),
     })
     @WebControllerLog(description = "二手房管理-VR项目审核通过/下线")
-    @ApiOperation(value = "VR项目审核通过/下线", position = 3)
+    @ApiOperation(value = "house-VR项目审核通过/下线")
     @GetMapping("house/audit/{houseId}/{status}")
     public Result houseAudit(@PathVariable String houseId, @PathVariable String status) {
         return secondHandService.houseAudit(houseId, status);
@@ -184,7 +188,7 @@ public class SecondHandController {
      * @return
      */
     @WebControllerLog(description = "二手房管理-VR模模型, 根据场景码查询（判断删除作用）")
-    @ApiOperation(value = "VR模模型-根据场景码查询", notes = "提供给四维看看，判断是否在720yun中使用此场景，true:有,四维看看不能删除此场景; false：可以删除")
+    @ApiOperation(value = "fdkk-VR模模型-根据场景码查询", notes = "提供给四维看看，判断是否在720yun中使用此场景，true:有,四维看看不能删除此场景; false：可以删除")
     @GetMapping(value = "fdkk/findBySceneCode")
     public Result vrFindBySceneCode(String sceneCode) {
 

cms_pano_fcb/remark.md

@@ -189,6 +189,11 @@ sit:
    select id, house_id, scene_code, is_delete,status,create_time,update_time from tb_scene where house_id in ('HUS000011397406059872989184') ;
    
    select id, house_id, scene_code, is_delete,status,create_time,update_time,web_site from tb_scene where house_id in ('HUS000011386576648927113216');
+   
+   
+   
+   # 修改数据库字段长度
+   ALTER TABLE tb_scene MODIFY COLUMN agent_id VARCHAR(100);
     
 # 720yun 需求
  1. 先上传全景图