更新:

 删除日志功能

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

@@ -1,7 +1,6 @@
 package com.gis.mapper;
 
 
-import com.gis.common.util.Result;
 import com.gis.domain.dto.ScenePageDto;
 import com.gis.domain.entity.SceneEntity;
 import com.gis.mapper.provider.SceneProvider;
@@ -9,7 +8,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.annotations.Update;
-import org.hibernate.mapping.Map;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -22,6 +20,9 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, String> {
     @SelectProvider(type = SceneProvider.class, method = "search")
     List<SceneEntity> search(ScenePageDto param);
 
+    @SelectProvider(type = SceneProvider.class, method = "searchUnion")
+    List<SceneEntity> searchUnion(ScenePageDto param);
+
     @Update("UPDATE tb_scene SET is_index=#{index}")
     void setIndex(Integer index);
 

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

@@ -22,7 +22,7 @@ public class SceneProvider {
         if(!StringUtils.isAllBlank(searchKey)){
             sql.append(" and (");
             sql.append(" scene_title like '%").append(searchKey).append("%'");
-            sql.append(" or room_name like '%").append(searchKey).append("%'");
+//            sql.append(" or room_name like '%").append(searchKey).append("%'");
             sql.append( ")");
         }
 
@@ -42,4 +42,56 @@ public class SceneProvider {
         log.info("sql: {}", sql.toString());
         return sql.toString();
     }
+
+
+    public String searchUnion(ScenePageDto param){
+        // type=building、garden ，查scene_title
+        StringBuffer sql = new StringBuffer("select * from tb_scene where is_delete = 0 and (type='building' or type='garden')");
+
+        String houseId = param.getHouseId();
+        if(!StringUtils.isAllBlank(houseId)){
+            sql.append(" and house_id = '").append(houseId).append("'");
+        }
+
+        String status = param.getStatus();
+        // 传3 过来，会把审核：4、未审核：3的都传给前端
+        if(StringUtils.isNotBlank(status)){
+            sql.append(" and status >= '").append(status).append("'");
+        }
+
+        String searchKey = param.getSearchKey();
+        if(!StringUtils.isAllBlank(searchKey)){
+            sql.append(" and (");
+            sql.append(" scene_title like '%").append(searchKey).append("%'");
+//            sql.append(" or room_name like '%").append(searchKey).append("%'");
+            sql.append( ")");
+        }
+
+
+
+
+
+        // UNION
+        // type=house ，查询room_name
+        sql.append(" UNION select * from tb_scene where is_delete = 0 and type='house' ");
+        if(!StringUtils.isAllBlank(houseId)){
+            sql.append(" and house_id = '").append(houseId).append("'");
+        }
+
+        if(StringUtils.isNotBlank(status)){
+            sql.append(" and status >= '").append(status).append("'");
+        }
+
+        if(!StringUtils.isAllBlank(searchKey)){
+            sql.append(" and (");
+            sql.append(" room_name like '%").append(searchKey).append("%'");
+            sql.append( ")");
+        }
+
+
+        sql.append(" order by sort asc, create_time asc");
+
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
 }

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

@@ -66,4 +66,6 @@ public interface SceneService extends IBaseService<SceneEntity, String> {
     Result saveUseHots(UseHotsDto param);
 
     List<SceneEntity> searchUseHots(String houseId, String sceneCode);
+
+    JSONObject searchUnion(ScenePageDto param);
 }

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

@@ -300,6 +300,23 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
     }
 
     @Override
+    public JSONObject searchUnion(ScenePageDto param) {
+        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());
+
+        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 saveUseHots(UseHotsDto param) {
         String id = param.getId();
         SceneEntity entity = this.findById(id);
@@ -323,6 +340,8 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
     }
 
 
+
+
     /**
      * 检查是否有计算中的场景
      * @param houseId

cms_pano_fcb/gis_web/src/main/java/com/gis/web/aop/WebLogAspect.java

@@ -71,7 +71,7 @@ public class WebLogAspect {
 
         // 这个方法只能提前，不能往后
         if (StringUtils.isBlank(description)) {
-            log.warn("description 11111 is null");
+            log.warn("description is null");
             return;
         }
 
@@ -85,35 +85,35 @@ public class WebLogAspect {
 
 
 
-        JSONObject jsonObject = JSONObject.parseObject(userInfo);
+//        JSONObject jsonObject = JSONObject.parseObject(userInfo);
 //        log.info("userInfo : " + jsonObject.toString());
 
-        log.info("request description  : {}", description);
-        List<String> detail = getDetail(description);
-            LogInfoDto logInfoDto = new LogInfoDto();
-            logInfoDto.setId(RandomUtils.getUuid());
-            String detail_0 = detail.get(0);
-//            log.info("detail_0:"+detail_0);
-            logInfoDto.setOperateType(detail_0);
-            String detail_1 = detail.get(1);
-//            log.info("detail_1:"+detail_1);
-            logInfoDto.setOperateContent(detail_1);
-            // 所属公司ID
-            logInfoDto.setOperatorCompanyId(jsonObject.getString("departmentId"));
-            // 所属公司
-            logInfoDto.setOperatorCompanyName(jsonObject.getString("departmentName"));
-            logInfoDto.setOperatorId(jsonObject.getString("id"));
-            logInfoDto.setOperatorName(jsonObject.getString("nickName"));
-            logInfoDto.setOperatorPhone(jsonObject.getString("userName"));
-            logInfoDto.setOperatorRoleId(jsonObject.getString("roleId"));
-            logInfoDto.setOperatorRoleName(jsonObject.getString("roleName"));
-
-            LocalDateTime now = LocalDateTime.now();
-            logInfoDto.setUpdateTime(now);
-            logInfoDto.setCreateTime(now);
-            logInfoDto.setOperateTime(now);
-
-            houseFeign.addLog(logInfoDto);
+//        log.info("request description  : {}", description);
+//        List<String> detail = getDetail(description);
+//            LogInfoDto logInfoDto = new LogInfoDto();
+//            logInfoDto.setId(RandomUtils.getUuid());
+//            String detail_0 = detail.get(0);
+////            log.info("detail_0:"+detail_0);
+//            logInfoDto.setOperateType(detail_0);
+//            String detail_1 = detail.get(1);
+////            log.info("detail_1:"+detail_1);
+//            logInfoDto.setOperateContent(detail_1);
+//            // 所属公司ID
+//            logInfoDto.setOperatorCompanyId(jsonObject.getString("departmentId"));
+//            // 所属公司
+//            logInfoDto.setOperatorCompanyName(jsonObject.getString("departmentName"));
+//            logInfoDto.setOperatorId(jsonObject.getString("id"));
+//            logInfoDto.setOperatorName(jsonObject.getString("nickName"));
+//            logInfoDto.setOperatorPhone(jsonObject.getString("userName"));
+//            logInfoDto.setOperatorRoleId(jsonObject.getString("roleId"));
+//            logInfoDto.setOperatorRoleName(jsonObject.getString("roleName"));
+//
+//            LocalDateTime now = LocalDateTime.now();
+//            logInfoDto.setUpdateTime(now);
+//            logInfoDto.setCreateTime(now);
+//            logInfoDto.setOperateTime(now);
+//
+//            houseFeign.addLog(logInfoDto);
 
 
 

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

@@ -33,6 +33,7 @@ import java.util.Map;
 @Api(tags = "场景管理")
 @RestController
 @RequestMapping("fcb/pano/scene")
+//@RequestMapping("a/pano/scene")
 public class SceneController extends BaseController {
 
     @Autowired
@@ -56,13 +57,19 @@ public class SceneController extends BaseController {
      * 30s 轮询一次
      * VR项目有计算中的模型，(true)允许轮询，(false)否则停止轮询
      */
-    @WebControllerLog(description = "场景管理-场景列表")
+//    @WebControllerLog(description = "场景管理-场景列表")
     @ApiOperation(value = "场景列表", position = 1)
     @PostMapping("list")
     public JSONObject list(@RequestBody ScenePageDto param) {
         return sceneService.jsonSearch(param);
     }
 
+    @ApiOperation(value = "场景列表(searchUnion)", position = 1)
+    @PostMapping("searchUnion")
+    public JSONObject searchUnion(@RequestBody ScenePageDto param) {
+        return sceneService.searchUnion(param);
+    }
+
 
 
 
@@ -74,7 +81,7 @@ public class SceneController extends BaseController {
      * @param type
      * @return 恒大id 唯一入口
      */
-    @WebControllerLog(description = "场景管理-创建场景")
+//    @WebControllerLog(description = "场景管理-创建场景")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "houseId", value = "房源id", dataType = "String", required = true),
             @ApiImplicitParam(name = "type", value = "场景类型， 楼盘:building， 园林：garden, 户型：house", dataType = "String"),
@@ -92,7 +99,7 @@ public class SceneController extends BaseController {
         return sceneService.uploadPanoRabbitMq(file, houseId, type, hengdaId);
     }
 
-    @WebControllerLog(description = "场景管理-场景排序")
+//    @WebControllerLog(description = "场景管理-场景排序")
     @ApiOperation(value = "场景排序")
     @PostMapping(value = "setSort")
     public Result setSort(@RequestBody Map<String, String> param) {
@@ -108,7 +115,7 @@ public class SceneController extends BaseController {
         return sceneService.upload(file);
     }
 
-    @WebControllerLog(description = "场景管理-编辑场景")
+//    @WebControllerLog(description = "场景管理-编辑场景")
     @ApiOperation(value = "VR项目修改", position = 3, notes = "修改VR项目的基础信息")
     @PostMapping("house/edit")
     public Result editHouse(@Valid @RequestBody EditHouseDto param) {
@@ -122,7 +129,7 @@ public class SceneController extends BaseController {
      * @param status
      * @return
      */
-    @WebControllerLog(description = "场景管理-VR项目审核通过/下线")
+//    @WebControllerLog(description = "场景管理-VR项目审核通过/下线")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "houseId", value = "房源id", dataType = "String", required = true),
             @ApiImplicitParam(name = "status", value = "状态， 审核通过/上线:4， 下线：3", dataType = "String"),
@@ -133,7 +140,7 @@ public class SceneController extends BaseController {
         return sceneService.houseAudit(houseId, status);
     }
 
-    @WebControllerLog(description = "场景管理-VR项目删除")
+//    @WebControllerLog(description = "场景管理-VR项目删除")
     @ApiOperation(value = "VR项目删除", position = 3, notes = "删除VR项目时，把相应场景设置为删除状态")
     @GetMapping("house/remove/{houseId}")
     public Result houseRemove(@PathVariable String houseId) {
@@ -141,7 +148,7 @@ public class SceneController extends BaseController {
         return sceneService.houseRemove(houseId);
     }
 
-    @WebControllerLog(description = "场景管理-编辑场景")
+//    @WebControllerLog(description = "场景管理-编辑场景")
     @ApiOperation(value = "编辑someData,(重命名)", position = 3)
     @PostMapping("editSomeData")
     public Result editSomeData(@Valid @RequestBody EditSomeDataDto param) {
@@ -238,14 +245,14 @@ public class SceneController extends BaseController {
         return Result.success(flag);
     }
 
-    @WebControllerLog(description = "场景管理-保存VR模型")
+//    @WebControllerLog(description = "场景管理-保存VR模型")
     @ApiOperation("VR模型保存")
     @PostMapping("saveVrModel")
     public Result saveVrModel(@Valid @RequestBody VrModelDto param) {
         return sceneService.saveVrModel(param);
     }
 
-    @WebControllerLog(description = "场景管理-保存初始画面")
+//    @WebControllerLog(description = "场景管理-保存初始画面")
     @ApiOperation("保存初始画面")
     @PostMapping("saveIndex")
     @ApiImplicitParams({
@@ -290,7 +297,7 @@ public class SceneController extends BaseController {
     }
 
 
-    @WebControllerLog(description = "场景管理-场景删除")
+//    @WebControllerLog(description = "场景管理-场景删除")
     @ApiOperation(value = "场景删除", notes = "判断VR项目关联场景、关联热点等判断")
     @GetMapping("removes/{id}")
     public Result remove(@PathVariable String id) {
@@ -379,7 +386,7 @@ public class SceneController extends BaseController {
      * @param houseId
      * @return
      */
-    @WebControllerLog(description = "场景管理-获取样本间")
+//    @WebControllerLog(description = "场景管理-获取样本间")
     @ApiOperation(value = "获取样本间", notes = "调用恒大接口")
     @PostMapping("findRoom/{houseId}")
     public Result findRoom(@PathVariable String houseId) {

cms_pano_fcb/remark.md

@@ -141,6 +141,11 @@ sit:
  1. 先上传全景图
  2. 在编辑场景
  
+ 3. vr模型加到全景园林
+        假如新增一个类型： 删除、还有给伟玉接口都需要修改
+        假如用回house类型， 会有一个问题，一个四维看看场景只能被一个VR项目使用
+        假如用回house类型， 类别返回时，需要把garden \ house 合并返回
+ 
  
 # 交换状态逻辑
     1. 720云只有一个初始场景（楼盘、园林、户型有且只有一个初始场景， isIndex=1）
@@ -155,7 +160,13 @@ sit:
 # uat 更新日志
     20210301-1700 
         更新热点场景引用删除问题, 需要更新数据库；
-        场景搜索添加room_name;    
+        场景搜索添加room_name;
+    
+    20210302-1100
+        全景图匹配素材标题，三维场景匹配户型名称
+         
+    20210302-1200
+        去掉日志功能            
 
 # pro 更新日志
     20210228-1722