From 6a3fd334dd052166feaff30a11c6dfb24f0f99eb Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 07 八月 2023 11:10:50 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/MetaService.java | 24 ++++++++++++++++++++----
1 files changed, 20 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 d8d2477..bd1c589 100644
--- a/src/main/java/com/lf/server/service/data/MetaService.java
+++ b/src/main/java/com/lf/server/service/data/MetaService.java
@@ -10,6 +10,7 @@
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
import com.lf.server.mapper.all.BasicMapper;
+import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.mapper.data.MetaMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.sys.MetaDownService;
@@ -65,6 +66,11 @@
}
@Override
+ public List<MetaEntity> selectGdbByGuid(String guid) {
+ return metaMapper.selectGdbByGuid(guid);
+ }
+
+ @Override
public Integer selectMetasForCount(String depcode, String dirs, String name) {
depcode = StringHelper.getRightLike(depcode);
name = StringHelper.getLikeUpperStr(name);
@@ -114,8 +120,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
@@ -238,6 +244,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++;
}
@@ -269,7 +278,7 @@
return;
}
- MetaEntity me = selectByGuid(guid, null);
+ MetaEntity me = selectByGuid(guid, null, null);
if (me == null) {
WebHelper.writeStr2Page(res, StaticData.NO_FILE);
return;
@@ -455,6 +464,9 @@
String filter = String.format("parentid in (%s)", StringHelper.join(ids, ","));
QueryWrapper<T> wrapper = new QueryWrapper<T>();
+ if (baseMapper instanceof GeomBaseMapper) {
+ wrapper.select("ST_AsText(geom) as geom, *");
+ }
wrapper.apply(filter);
return wrapper;
@@ -505,6 +517,8 @@
case StaticData.MPT:
addMultiFile(uploadPath, mf, zip, params, StaticData.MPT_EXT);
break;
+ case StaticData.JPG:
+ addMultiFile(uploadPath, mf, zip, params, StaticData.JPG_EXT);
case StaticData.IMG:
addMultiFile(uploadPath, mf, zip, params, StaticData.IMG_EXT);
break;
@@ -518,6 +532,8 @@
addMultiFile(uploadPath, mf, zip, params, StaticData.SHP_EXT);
break;
case StaticData.GDB:
+ continue;
+ case StaticData.OSGB:
addFolderFile(uploadPath, mf, zip, params);
break;
default:
@@ -591,7 +607,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