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/show/DataLibService.java | 49 ++++++++++---------------------------------------
1 files changed, 10 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/lf/server/service/show/DataLibService.java b/src/main/java/com/lf/server/service/show/DataLibService.java
index f6f1fe3..8ef4765 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -10,7 +10,7 @@
import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.mapper.data.DownloadMapper;
import com.lf.server.service.all.BaseQueryService;
-import com.lf.server.service.data.DownloadService;
+import com.lf.server.service.data.MetaService;
import net.lingala.zip4j.ZipFile;
import net.lingala.zip4j.model.ZipParameters;
import org.apache.commons.logging.Log;
@@ -31,10 +31,10 @@
PathHelper pathHelper;
@Autowired
- DownloadMapper downloadMapper;
+ MetaService metaService;
@Autowired
- DownloadService downloadService;
+ DownloadMapper downloadMapper;
@Autowired
BaseQueryService baseQueryService;
@@ -65,9 +65,7 @@
QueryWrapper wrapper = getWrapper4DbOverflow(ue, dr);
Integer srid = baseQueryService.getSrid(baseMapper);
- if (null != srid) {
- wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", dr.getWkt(), srid));
- }
+ wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", dr.getWkt(), srid));
List<String> ids = baseMapper.selectObjs(wrapper);
addDepCodes(rs, ids);
@@ -163,7 +161,7 @@
ZipParameters params = Zip4jHelper.getZipParams(true);
zip.addFolder(new File(gdbPath), params);
// zip.addFolder(new File(annexPath), params)
- downloadService.addAnnex(zip, params, annexMap);
+ metaService.addAnnex(zip, params, annexMap);
String dbPwd = Md5Helper.reverse(Md5Helper.generate(dr.getPwd()));
DownloadEntity de = getDownloadEntity(ue, zipFile, dbPwd);
@@ -184,34 +182,7 @@
}
QueryWrapper wrapper = createQueryWrapper(baseMapper, dr);
- List list = baseMapper.selectList(wrapper);
- if (null == list || list.size() == 0) {
- continue;
- }
-
- if (!dataMap.containsKey(entity)) {
- dataMap.put(entity, list);
- } else {
- dataMap.get(entity).addAll(list);
- }
- if (wrapper.isEmptyOfWhere()) {
- wrapper.apply("1 = 1");
- }
- if ("bborehole".equals(entity)) {
- wrapper.last("limit 100");
- }
-
- String tab = BaseQueryService.getTabName(baseMapper);
- List<AttachEntity> annex = baseMapper.selectAnnex(tab, wrapper);
- if (null == annex || annex.isEmpty()) {
- continue;
- }
-
- if (!annexMap.containsKey(entity)) {
- annexMap.put(tab.replace(".", "_"), annex);
- } else {
- annexMap.get(tab.replace(".", "_")).addAll(annex);
- }
+ metaService.addData(entity, baseMapper, wrapper, dataMap, annexMap);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
@@ -232,10 +203,10 @@
// wrapper.apply(String.format("depid like '%s'", StringHelper.getRightLike(dr.getDepcode())))
wrapper.likeRight("depid", dr.getDepcode());
}
- if (baseMapper instanceof GeomBaseMapper && !StringHelper.isEmpty(dr.getWkt())) {
+ if (baseMapper instanceof GeomBaseMapper) {
wrapper.select("ST_AsText(geom) as geom, *");
- Integer srid = baseQueryService.getSrid((GeomBaseMapper) baseMapper);
- if (null != srid) {
+ if (!StringHelper.isEmpty(dr.getWkt())) {
+ Integer srid = baseQueryService.getSrid((GeomBaseMapper) baseMapper);
wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", dr.getWkt(), srid));
}
}
@@ -290,7 +261,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(4);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
--
Gitblit v1.9.3