新建获取四维看看所有场景码接口-只提供新房的

cms_pano_fcb/gis_mapper/src/main/java/com/gis/mapper/SceneMapper.java

@@ -24,14 +24,6 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, String> {
     @SelectProvider(type = SceneProvider.class, method = "searchUnion")
     List<SceneEntity> searchUnion(ScenePageDto param);
 
-//    @Update("UPDATE tb_scene SET is_index=#{index}")
-//    void setIndex(Integer index);
-//
-//    @Update("UPDATE tb_scene SET is_index=#{index} where house_id = #{houseId}")
-//    void setIndexByHouseId(Integer index, String houseId);
-//
-//    @Update("UPDATE tb_scene SET is_index=#{index} where id = #{id}")
-//    void setIndexById(String id, Integer index);
 
     @Select("select * from tb_scene where is_delete = 0 and scene_code = #{sceneCode}")
     SceneEntity findBySceneCode(String sceneCode);
@@ -39,8 +31,6 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, String> {
     @Select("select * from tb_scene where is_delete = 0 and scene_code = #{sceneCode}")
     List<SceneEntity> listFindBySceneCode(String sceneCode);
 
-//    @Select("select * from tb_scene where is_delete = 0 and vr_model_id = #{vrModelId}")
-//    SceneEntity findByVrModelId(String vrModelId);
 
     @Select("select * from tb_scene where is_delete = 0 and vr_model_id = #{vrModelId}")
     List<SceneEntity> findByVrModelId2(String vrModelId);
@@ -51,11 +41,6 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, String> {
     @Select("select * from tb_scene where is_delete = 0 and is_index = 1 and house_id = #{houseId} ")
     List<SceneEntity> getIndex(String houseId);
 
-    @Select("select * from tb_scene where is_delete = 0 and house_id = #{houseId}")
-    List<SceneEntity> findByHouseId(String houseId);
-
-//    @Select("select * from tb_scene where is_delete = 0 and house_id = #{houseId} and type = #{type} order by sort asc, create_time asc ")
-//    List<SceneEntity> findByHouseIdAndType(String houseId, String type);
 
     @Update("UPDATE tb_scene SET sort=#{sort} , update_time = NOW() where id = #{id}")
     void setSortById(String id, String sort);
@@ -88,8 +73,7 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, String> {
     @Update("UPDATE tb_scene SET icon = #{icon} , update_time = NOW() where is_delete = 0 AND scene_code = #{sceneCode}")
     void updateIcon(String sceneCode, String icon);
 
-//    @Select("select house_id, scene_title, is_index, scene_code, is_delete from tb_scene where is_delete = 0 and is_index=1")
-//    List<SceneEntity> findAllByIndex();
+
 
     @Select("select * from tb_scene where is_delete = 0 and house_id = #{houseId} and room_id = #{roomId}")
     List<SceneEntity> findByHouseIdAndRoomId(String houseId, String roomId);
@@ -100,12 +84,14 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, String> {
     @SelectProvider(type = SceneProvider.class, method = "countByType")
     Integer countByType(String houseId, String type);
 
-//    @Select("select id, house_id, scene_code,hengda_id,room_id, type, is_delete,status,create_time,update_time  from tb_scene where is_delete = 0 and status >= 3 and type = 'house'")
-//    List<SceneEntity> findByRoodData();
+
 
     @Select("select scene_code, by_type from tb_scene where is_delete = 0 and type = #{type} and house_id = #{houseId}")
     List<SceneEntity> getVrSceneCodeAndType(String houseId, String type);
 
     @Select("select * from tb_scene where is_delete = 0 and (status=3 or status=4) and house_id = #{houseId}")
     List<SceneAndInitVo> voFindByHouseId(String houseId);
+
+    @Select("select scene_code from tb_scene where is_delete = 0 and type = #{type}")
+    List<String> getAllAgeCode(String type);
 }

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

@@ -20,11 +20,11 @@ public interface SceneService extends IBaseService<SceneEntity, String> {
 
     Result search(ScenePageDto param);
 
-//    Result editHouse(EditHouseDto param);
+
 
     Result findVrModel(SceneRroPageDto param);
 
-//    Result findVrModel2(SceneRroPageDto param);
+
 
     Result saveVrModel(VrModelDto param);
 
@@ -36,16 +36,8 @@ public interface SceneService extends IBaseService<SceneEntity, String> {
 
     List<SceneEntity> listFindBySceneCode(String sceneCode);
 
-    Result findRoom(String houseId);
-
     Result editSomeData(EditSomeDataDto param);
 
-//    Result setIndex(String id);
-//
-//    Result getIndex(String houseId);
-
-    Result findByHouseId(String houseId);
-
     Result setSort(Map<String, String> param);
 
     Result getVrSceneCode(String houseId, String status, String type);
@@ -74,4 +66,6 @@ public interface SceneService extends IBaseService<SceneEntity, String> {
     Result editAgent(AgentDto param);
 
     Result remove(String id);
+
+    Result getAllAgeCode(String type);
 }

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

@@ -286,37 +286,7 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
 
     }
 
-//    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;
-//    }
+
 
 
     @Override
@@ -344,8 +314,6 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
         startPage(param);
         List<SceneEntity> search = entityMapper.search(param);
         PageInfo<SceneEntity> page = new PageInfo<>(search);
-//        log.info("page size: " + page.getSize());
-//        log.info("page total: " + page.getTotal());
 
         JSONObject result = new JSONObject();
         result.put("code", 0);
@@ -361,8 +329,6 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
         startPage(param);
         List<SceneEntity> search = entityMapper.searchUnion(param);
         PageInfo<SceneEntity> page = new PageInfo<>(search);
-//        log.info("page size: " + page.getSize());
-//        log.info("page total: " + page.getTotal());
 
         // 特殊处理，需要把byType=garden的类型修改为type=garden
         List<SceneEntity> list = page.getList();
@@ -513,6 +479,16 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
         return Result.success();
     }
 
+    @Override
+    public Result getAllAgeCode(String type) {
+        List<String> list = entityMapper.getAllAgeCode(type);
+        int size = list.size();
+        log.info("场景码数量： {}", size);
+
+        return Result.success("场景码数量：" + size , list);
+
+    }
+
 
     @Override
     public Result saveUseHots(UseHotsDto param) {
@@ -555,10 +531,7 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
     }
 
 
-    @Override
-    public Result findByHouseId(String houseId) {
-        return Result.success(entityMapper.findByHouseId(houseId));
-    }
+
 
     @Override
     public Result setSort(Map<String, String> param) {
@@ -833,10 +806,7 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
         return entityMapper.listFindBySceneCode(sceneCode);
     }
 
-    @Override
-    public Result findRoom(String houseId) {
-        return null;
-    }
+
 
     @Override
     public Result editSomeData(EditSomeDataDto param) {

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

@@ -115,6 +115,18 @@ public class HouseController extends BaseController {
     }
 
 
+    /**
+     * 2021-09-23
+     * @return
+     */
+    @WebControllerLog(description = "VR项目-获取4dkk所有场景码列表")
+    @ApiOperation(value = "获取4dkk所有场景码列表，只提供新房的")
+    @GetMapping("getAllAgeCode")
+    public Result getAllAgeCode() {
+        return sceneService.getAllAgeCode("house");
+    }
+
+