From fc942f8fce38daf4f1641c0f105fdc3117b5485f Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期一, 19 六月 2023 17:17:08 +0800 Subject: [PATCH] 1 --- src/main/java/com/lf/server/service/data/MetaService.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/lf/server/service/data/MetaService.java b/src/main/java/com/lf/server/service/data/MetaService.java index d05fb0d..b785af9 100644 --- a/src/main/java/com/lf/server/service/data/MetaService.java +++ b/src/main/java/com/lf/server/service/data/MetaService.java @@ -115,8 +115,8 @@ } @Override - public MetaEntity selectByGuid(String guid, String tab) { - return metaMapper.selectByGuid(guid, tab); + public MetaEntity selectByGuid(String guid, String dircode, String tab) { + return metaMapper.selectByGuid(guid, dircode, tab); } @Override @@ -270,7 +270,7 @@ return; } - MetaEntity me = selectByGuid(guid, null); + MetaEntity me = selectByGuid(guid, null, null); if (me == null) { WebHelper.writeStr2Page(res, StaticData.NO_FILE); return; @@ -524,6 +524,7 @@ addMultiFile(uploadPath, mf, zip, params, StaticData.SHP_EXT); break; case StaticData.GDB: + case StaticData.OSGB: addFolderFile(uploadPath, mf, zip, params); break; default: @@ -597,7 +598,7 @@ private DownloadEntity getDownloadEntity(UserEntity ue, String file, String pwd) { DownloadEntity de = new DownloadEntity(); de.setName(FileHelper.getFileName(file)); - // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠¢亾鍒嗘瀽锛�6-缁熻鎶ュ憡 + // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠¢亾鍒嗘瀽锛�6-缁熻鎶ュ憡锛�7-闄勪欢鏂囦欢锛�8-鐡︾墖鏂囦欢 de.setType(3); de.setSizes(FileHelper.sizeToMb(new File(file).length())); de.setDepid(ue.getDepid()); -- Gitblit v1.9.3