From a4e74d2684146cb5e3790fddc6d077e52e71205e Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期三, 28 六月 2023 18:31:47 +0800 Subject: [PATCH] 发布管理的查询元数据信息时添加DOM和DEM的目录过滤功能 --- src/main/java/com/lf/server/controller/data/PublishController.java | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/lf/server/controller/data/PublishController.java b/src/main/java/com/lf/server/controller/data/PublishController.java index b2ab5fb..1fc3076 100644 --- a/src/main/java/com/lf/server/controller/data/PublishController.java +++ b/src/main/java/com/lf/server/controller/data/PublishController.java @@ -56,7 +56,7 @@ return fail("鏁版嵁绫诲埆涓虹┖", null); } - String types = getType(type); + String types = getType(dircode, type); int count = publishService.selectMetasByCount(depcode, dircode, verid, types, name); if (count == 0) { return success(0, null); @@ -73,12 +73,12 @@ /** * 鑾峰彇绫诲瀷 */ - private String getType(String type) throws Exception { + private String getType(String dircode, String type) throws Exception { switch (type) { case "DOM": - return "type in ('tif', 'tiff', 'img')"; + return "type in ('tif', 'tiff', 'img')" + getFilter(dircode, type); case "DEM": - return "type in ('tif', 'tiff')"; + return "type in ('tif', 'tiff')" + getFilter(dircode, type); case "MPT": return "type = 'mpt'"; case "3DML": @@ -96,6 +96,34 @@ } } + /** + * 鑾峰彇杩囨护鏉′欢 + */ + private String getFilter(String dircode, String type) { + dircode = StringHelper.isEmpty(dircode) ? "" : StringHelper.getRightLike(dircode); + + List<String> list = null; + switch (type) { + case "DOM": + list = publishService.selectCodesForDir(dircode, 0); + break; + case "DEM": + list = publishService.selectCodesForDir(dircode, 1); + break; + default: + break; + } + if (null == list || list.isEmpty()) { + return ""; + } + + for (int i = 0, c = list.size(); i < c; i++) { + list.set(i, "'" + list.get(i) + "'"); + } + + return " and dircode not in (" + StringHelper.join(list, ",") + ")"; + } + @SysLog() @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟") @ApiImplicitParams({ -- Gitblit v1.9.3