From f913d44fbf160caafde4de10a8406d7908dfecd6 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期一, 04 十二月 2023 09:19:24 +0800 Subject: [PATCH] 修改查询GDB文件接口 --- src/main/java/com/moon/server/service/data/MetaService.java | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/moon/server/service/data/MetaService.java b/src/main/java/com/moon/server/service/data/MetaService.java index 6c3d997..6d209c3 100644 --- a/src/main/java/com/moon/server/service/data/MetaService.java +++ b/src/main/java/com/moon/server/service/data/MetaService.java @@ -48,21 +48,26 @@ private final static Log log = LogFactory.getLog(MetaService.class); @Override - public Integer selectCount(String depcode, String dircode, Integer verid, String name) { + public Integer selectCount(String depcode, String dircode, Integer verid, String name, Integer sensorType, Integer mataType, Date startDate, Date endDate, String wkt) { depcode = StringHelper.getRightLike(depcode); dircode = StringHelper.getRightLike(dircode); name = StringHelper.getLikeUpperStr(name); - return metaMapper.selectCount(depcode, dircode, verid, name); + return metaMapper.selectCount(depcode, dircode, verid, name, sensorType, mataType, startDate, endDate, wkt); } @Override - public List<MetaEntity> selectByPage(String depcode, String dircode, Integer verid, String name, Integer limit, Integer offset) { + public List<MetaEntity> selectByPage(String depcode, String dircode, Integer verid, String name, Integer sensorType, Integer mataType, Date startDate, Date endDate, String wkt, Integer limit, Integer offset) { depcode = StringHelper.getRightLike(depcode); dircode = StringHelper.getRightLike(dircode); name = StringHelper.getLikeUpperStr(name); - return metaMapper.selectByPage(depcode, dircode, verid, name, limit, offset); + return metaMapper.selectByPage(depcode, dircode, verid, name, sensorType, mataType, startDate, endDate, wkt, limit, offset); + } + + @Override + public List<MetaEntity> selectGdbByGuid(String guid) { + return metaMapper.selectGdbByGuid(guid); } @Override @@ -115,6 +120,11 @@ } @Override + public List<MetaEntity> selectByIds(String ids) { + return metaMapper.selectByIds(ids); + } + + @Override public MetaEntity selectByGuid(String guid, String dircode, String tab) { return metaMapper.selectByGuid(guid, dircode, tab); } @@ -124,8 +134,12 @@ return metaMapper.selectByIdsForTab(ids); } - @Override public List<MetaEntity> selectMetaFiles(List<Integer> ids) { + return metaMapper.selectMetaFiles(StringHelper.join(ids, StaticData.COMMA)); + } + + @Override + public List<MetaEntity> selectMetaFiles(String ids) { return metaMapper.selectMetaFiles(ids); } @@ -238,6 +252,9 @@ } if (str.contains("bs.s_explorationpoint ")) { list.add(str.replace("bs.s_explorationpoint ", "bs.s_surveyworksite ")); + } + if (str.contains("bs.m_surface_deformation_data ")) { + list.add(str.replace("bs.m_surface_deformation_data ", "bs.m_surface_deformation_data_date ")); } i++; @@ -511,6 +528,10 @@ break; case StaticData.JPG: addMultiFile(uploadPath, mf, zip, params, StaticData.JPG_EXT); + break; + case StaticData.JP2: + addMultiFile(uploadPath, mf, zip, params, StaticData.JP2_EXT); + break; case StaticData.IMG: addMultiFile(uploadPath, mf, zip, params, StaticData.IMG_EXT); break; @@ -524,6 +545,8 @@ addMultiFile(uploadPath, mf, zip, params, StaticData.SHP_EXT); break; case StaticData.GDB: + continue; + case StaticData.OSGB: addFolderFile(uploadPath, mf, zip, params); break; default: @@ -628,4 +651,17 @@ metaDownService.inserts(list); } + + /** + * 鑾峰彇绌洪棿杩囨护 + */ + public String getGeometryFilter(String wkt) throws Exception { + if (StringHelper.isEmpty(wkt)) { + return null; + } + + wkt = AesHelper.decrypt(wkt); + + return String.format("ST_Intersects(ST_GeomFromText('%s', %d), geom)", wkt, StaticData.I104903); + } } -- Gitblit v1.9.3