From cb9fbcd27a288d0c61d85fa13ff5fc8eb1f4deab Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 三月 2023 16:44:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/DataLibService.java | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 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 c5dca3d..89b1d58 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -91,8 +91,8 @@
/**
* 鍒涘缓Zip鍖�
*/
- public String createZipFile(UserEntity ue, List<String> entities, String wkt, String pwd) throws Exception {
- Map<String, List<?>> map = queryData(entities, wkt);
+ public String createZipFile(UserEntity ue, List<String> entities, String depcode, String dirs, String wkt, String pwd) throws Exception {
+ Map<String, List<?>> map = queryData(entities, depcode, dirs, wkt);
if (map.size() == 0) {
return null;
}
@@ -112,7 +112,7 @@
String zipFile = pathHelper.getDownloadFullPath() + File.separator + zipName;
ZipFile zip = Zip4jHelper.createZipFile(zipFile, pwd);
- ZipParameters params = Zip4jHelper.getZipParams();
+ ZipParameters params = Zip4jHelper.getZipParams(true);
addZipFiles(zip, params, file.listFiles());
String dbPwd = Md5Helper.reverse(Md5Helper.generate(pwd));
@@ -125,7 +125,7 @@
/**
* 鏌ヨ鏁版嵁
*/
- private Map<String, List<?>> queryData(List<String> entities, String wkt) {
+ private Map<String, List<?>> queryData(List<String> entities, String depcode, String dirs, String wkt) {
Map<String, List<?>> map = new HashMap<>(5);
for (String enity : entities) {
try {
@@ -134,7 +134,7 @@
continue;
}
- QueryWrapper wrapper = createWrapper(baseMapper, wkt);
+ QueryWrapper wrapper = createWrapper(baseMapper, depcode, dirs, wkt);
List<?> list = baseMapper.selectList(wrapper);
if (null == list || list.size() == 0) {
continue;
@@ -154,13 +154,23 @@
/**
* 鍒涘缓QueryWrapper
*/
- private QueryWrapper createWrapper(GeomBaseMapper baseMapper, String wkt) {
+ private QueryWrapper createWrapper(BasicMapper baseMapper, String depcode, String dirs, String wkt) {
QueryWrapper wrapper = new QueryWrapper();
- wrapper.select("ST_AsText(geom) as geom, *");
+ if (baseMapper instanceof GeomBaseMapper) {
+ wrapper.select("ST_AsText(geom) as geom, *");
- Integer srid = baseQueryService.getSrid(baseMapper);
- if (null != srid) {
- wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", wkt, srid));
+ Integer srid = baseQueryService.getSrid((GeomBaseMapper) baseMapper);
+ if (null != srid) {
+ wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", wkt, srid));
+ }
+ }
+ if (!StringHelper.isEmpty(depcode)) {
+ wrapper.likeRight("depid", depcode);
+ }
+
+ dirs = DataLibService.copeCodes(dirs, "dirid");
+ if (!StringHelper.isEmpty(dirs)) {
+ wrapper.apply(dirs);
}
return wrapper;
@@ -186,10 +196,10 @@
/**
* 鑾峰彇涓嬭浇瀹炰綋绫�
*/
- private DownloadEntity getDownloadEntity(UserEntity ue, String file, String pwd) throws Exception {
+ 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-缁熻鎶ュ憡
de.setType(4);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
@@ -207,7 +217,7 @@
/**
* 鎵撳寘DB鏁版嵁
*/
- public String zipDbData(UserEntity ue, String name, String filter, String pwd) throws Exception {
+ public String zipDbData(UserEntity ue, String name, String depcode, String dirs, String filter, String pwd) throws Exception {
BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
if (baseMapper == null) {
return null;
@@ -217,6 +227,14 @@
baseQueryService.addFilterWrapper(wrapper, filter);
if (baseMapper instanceof GeomBaseMapper) {
wrapper.select("ST_AsText(geom) as geom, *");
+ }
+ if (!StringHelper.isEmpty(depcode)) {
+ wrapper.likeRight("depid", depcode);
+ }
+
+ dirs = DataLibService.copeCodes(dirs, "dirid");
+ if (!StringHelper.isEmpty(dirs)) {
+ wrapper.apply(dirs);
}
List<?> list = baseMapper.selectList(wrapper);
@@ -248,7 +266,7 @@
String zipFile = pathHelper.getDownloadFullPath() + File.separator + zipName;
ZipFile zip = Zip4jHelper.createZipFile(zipFile, pwd);
- ZipParameters params = Zip4jHelper.getZipParams();
+ ZipParameters params = Zip4jHelper.getZipParams(true);
addZipFiles(zip, params, file.listFiles());
String dbPwd = Md5Helper.reverse(Md5Helper.generate(pwd));
--
Gitblit v1.9.3