更新全景图搜索功能

720yun_fd_manage/gis_mapper/src/main/java/com/gis/mapper/FodderMapper.java

@@ -2,6 +2,7 @@ package com.gis.mapper;
 
 
 import com.gis.domain.dto.FodderPageDto;
+import com.gis.domain.dto.PageDto;
 import com.gis.domain.entity.FodderEntity;
 import com.gis.mapper.provider.FodderProvider;
 import org.apache.ibatis.annotations.Mapper;
@@ -27,4 +28,7 @@ public interface FodderMapper extends IBaseMapper<FodderEntity, Long> {
 
     @Select("select * from tb_fodder where is_delete = 0 and scene_code = #{sceneCode} ")
     FodderEntity findBySceneCode(String sceneCode);
+
+    @SelectProvider(type = FodderProvider.class, method = "searchPano")
+    List<FodderEntity> searchPano(PageDto param, String userId);
 }

720yun_fd_manage/gis_mapper/src/main/java/com/gis/mapper/provider/FodderProvider.java

@@ -1,6 +1,7 @@
 package com.gis.mapper.provider;
 
 import com.gis.domain.dto.FodderPageDto;
+import com.gis.domain.dto.PageDto;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 
@@ -34,5 +35,31 @@ public class FodderProvider {
     }
 
 
+    /**
+     * 搜索全景图
+     * 只获取计算完成的全景图
+     * @param param
+     * @param userId
+     * @return
+     */
+    public String searchPano(PageDto param, String userId){
+        StringBuffer sql = new StringBuffer("select * from tb_fodder where is_delete = 0 and type = 'pano' and status = 3 ");
+
+        if(!StringUtils.isAllBlank(userId)){
+            sql.append(" and ( user_id = '").append(userId).append("' )");
+        }
+
+        String searchKey = param.getSearchKey();
+        if(!StringUtils.isAllBlank(searchKey)){
+            sql.append(" and ( name like '%").append(searchKey).append("%' )");
+        }
+
+        sql.append(" order by create_time asc");
+
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
+
+
 
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/FodderServiceImpl.java

@@ -195,7 +195,10 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
     @Override
     public Result selectFodderPano(PageDto param, Long workId) {
         startPage(param);
-        List<FodderEntity> list = entityMapper.findByStatusAndTypeAndUserId(3, "pano", getUserNameForToken());
+//        List<FodderEntity> list = entityMapper.findByStatusAndTypeAndUserId(3, "pano", getUserNameForToken());
+
+        List<FodderEntity> list = entityMapper.searchPano(param, getUserNameForToken());
+
         // 作品场景查重
         List<String> useScenes = sceneService.strFindByWorkId(workId, "pano");
 

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/FodderController.java

@@ -87,11 +87,6 @@ public class FodderController extends BaseController {
     }
 
 
-//    @ApiOperation(value = "选择素材", position = 1, notes = "type: 图片：image, 音频：audio， 视频：video")
-//    @PostMapping("select/{type}")
-//    public Result selectFodderType(@RequestBody PageDto param, @PathVariable String type) {
-//        return fodderService.selectFodderType(param, type);
-//    }
 
     @ApiOperation(value = "选择全景图", position = 1)
     @PostMapping("select/pano/{workId}")

720yun_fd_manage/remark.md

@@ -41,6 +41,10 @@
    
    
 # sit 是用的四维看看测试服务器  
+    web: http://test.4dkankan.com/panorama/edit.html?id=17#/base
+    13112311178    11111111Aa
+    doc: http://120.25.146.52:8001/doc.html
+    
  
 # 交换状态逻辑
     1. 用户体系用四维看看的sso
@@ -56,9 +60,6 @@
     1. 原型: 创建场景时，默认给个分组，还是分组后才能创建场景    
     
     
-# 开发日志
-    20210316 
-        四大模块的功能流程已完成；
-        下一步需要完善状态、消费队列    
+