From 7a481b56048d2356ed1b0e3eaef3e44a3d610f64 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 28 三月 2023 09:28:40 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/DataLibService.java | 156 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 123 insertions(+), 33 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 8bafeeb..9e7b76c 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -46,34 +46,29 @@
* 鏌ヨDB涓孩鍑虹殑鍗曚綅缂栫爜
*/
public List<String> selectDbOverflowDep(UserEntity ue, DownloadReqEntity dr) {
- if (StringHelper.isEmpty(dr.getWkt())) {
- return selectDbOverflowDep4Wkt(ue, dr.getEntities(), dr.getWkt());
+ if (!StringHelper.isEmpty(dr.getWkt())) {
+ return selectDbOverflowDep4Wkt(ue, dr);
}
- return selectDbOverflowDep4Prop(ue, dr.getEntities().get(0), dr.getIds(), dr.getFilter());
+ return selectDbOverflowDep4Prop(ue, dr);
}
/**
* 鏌ヨDB涓孩鍑虹殑鍗曚綅缂栫爜-绌洪棿鏌ヨ
*/
- public List<String> selectDbOverflowDep4Wkt(UserEntity ue, List<String> entities, String wkt) {
+ public List<String> selectDbOverflowDep4Wkt(UserEntity ue, DownloadReqEntity dr) {
List<String> rs = new ArrayList<>();
- for (String entity : entities) {
+ for (String entity : dr.getEntities()) {
try {
GeomBaseMapper<?> baseMapper = ClassHelper.getGeoBaseMapper(entity);
if (null == baseMapper) {
continue;
}
- QueryWrapper wrapper = new QueryWrapper();
- wrapper.select("depid");
- // wrapper.gt("depid", 0); wrapper.apply(String.format("depid != ALL(fn_rec_array(%d, 'dep'))", ue.getDepid()))
- wrapper.apply("depid is not null and depid not like '" + ue.getDepcode() + "%'");
- wrapper.groupBy("depid");
-
+ QueryWrapper wrapper = getWrapper4DbOverflow(ue, dr);
Integer srid = baseQueryService.getSrid(baseMapper);
if (null != srid) {
- wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", wkt, srid));
+ wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", dr.getWkt(), srid));
}
List<String> ids = baseMapper.selectObjs(wrapper);
@@ -89,21 +84,15 @@
/**
* 鏌ヨDB涓孩鍑虹殑鍗曚綅缂栫爜-灞炴�ф煡璇�
*/
- public List<String> selectDbOverflowDep4Prop(UserEntity ue, String entity, List<Integer> gids, String filter) {
+ public List<String> selectDbOverflowDep4Prop(UserEntity ue, DownloadReqEntity dr) {
List<String> rs = new ArrayList<>();
try {
- BasicMapper<?> baseMapper = ClassHelper.getBasicMapper(entity);
+ BasicMapper<?> baseMapper = ClassHelper.getBasicMapper(dr.getEntities().get(0));
if (null == baseMapper) {
return rs;
}
- QueryWrapper wrapper = new QueryWrapper();
- wrapper.select("depid");
- baseQueryService.addFilterWrapper(wrapper, filter);
- if (null != gids && gids.size() > 0) {
- wrapper.apply(String.format("gid in (%s)", StringHelper.join(gids, ",")));
- }
- wrapper.groupBy("depid");
+ QueryWrapper wrapper = getWrapper4DbOverflow(ue, dr);
List<String> ids = baseMapper.selectObjs(wrapper);
addDepCodes(rs, ids);
@@ -112,6 +101,32 @@
}
return rs;
+ }
+
+ /**
+ * 鏌ヨDB涓孩鍑哄崟浣嶇紪鐮佺殑鏌ヨ鍖呰鍣�
+ */
+ private <T> QueryWrapper<T> getWrapper4DbOverflow(UserEntity ue, DownloadReqEntity dr) {
+ QueryWrapper<T> wrapper = new QueryWrapper<T>();
+ wrapper.select("depid");
+ wrapper.groupBy("depid");
+ wrapper.apply("depid is not null and depid not like '" + ue.getDepcode() + "%'");
+
+ if (null != dr.getIds() && dr.getIds().size() > 0) {
+ wrapper.apply(String.format("gid in (%s)", StringHelper.join(dr.getIds(), ",")));
+ } else {
+ baseQueryService.addFilterWrapper(wrapper, dr.getFilter());
+ }
+
+ String dirs = copeCodes(dr.getDirs(), "dirid");
+ if (!StringHelper.isEmpty(dirs)) {
+ wrapper.apply(dirs);
+ }
+ if (!StringHelper.isEmpty(dr.getDepcode())) {
+ wrapper.likeRight("depid", dr.getDepcode());
+ }
+
+ return wrapper;
}
/**
@@ -130,10 +145,81 @@
}
/**
- * 鍒涘缓Zip鍖�
+ * 璇锋眰DB鏁版嵁涓嬭浇
*/
- 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);
+ public String downloadDbReq(UserEntity ue, DownloadReqEntity dr) {
+ Map<String, List<?>> map = queryData(dr);
+ if (map.size() == 0) {
+ return null;
+ }
+
+ return null;
+ }
+
+ /**
+ * 鏌ヨ鏁版嵁
+ */
+ private Map<String, List<?>> queryData(DownloadReqEntity dr) {
+ Map<String, List<?>> map = new HashMap<>(3);
+ for (String enity : dr.getEntities()) {
+ try {
+ BasicMapper baseMapper = ClassHelper.getBasicMapper(enity);
+ if (null == baseMapper) {
+ continue;
+ }
+
+ QueryWrapper wrapper = createQueryWrapper(baseMapper, dr);
+ List<?> list = baseMapper.selectList(wrapper);
+ if (null == list || list.size() == 0) {
+ continue;
+ }
+
+ if (!map.containsKey(enity)) {
+ map.put(enity, list);
+ }
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+ }
+
+ return map;
+ }
+
+ /**
+ * 鍒涘缓鏌ヨ鍖呰鍣�
+ */
+ private <T> QueryWrapper<T> createQueryWrapper(BasicMapper baseMapper, DownloadReqEntity dr) {
+ QueryWrapper<T> wrapper = new QueryWrapper<T>();
+
+ String dirs = copeCodes(dr.getDirs(), "dirid");
+ if (!StringHelper.isEmpty(dirs)) {
+ wrapper.apply(dirs);
+ }
+ if (!StringHelper.isEmpty(dr.getDepcode())) {
+ wrapper.likeRight("depid", dr.getDepcode());
+ }
+ if (baseMapper instanceof GeomBaseMapper && !StringHelper.isEmpty(dr.getWkt())) {
+ wrapper.select("ST_AsText(geom) as geom, *");
+ Integer srid = baseQueryService.getSrid((GeomBaseMapper) baseMapper);
+ if (null != srid) {
+ wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", dr.getWkt(), srid));
+ }
+ }
+ if (null != dr.getIds() && dr.getIds().size() > 0) {
+ wrapper.apply(String.format("gid in (%s)", StringHelper.join(dr.getIds(), ",")));
+ } else {
+ baseQueryService.addFilterWrapper(wrapper, dr.getFilter());
+ }
+
+ return wrapper;
+ }
+
+ /**
+ * 璇锋眰DB鏁版嵁涓嬭浇-绌洪棿鏌ヨ
+ */
+ public String downloadDbReq4Wkt(UserEntity ue, DownloadReqEntity dr) throws Exception {
+ String depcode = null == dr.getDepcodes() || dr.getDepcodes().isEmpty() ? null : dr.getDepcodes().get(0);
+ Map<String, List<?>> map = queryData(dr.getEntities(), depcode, dr.getDirs(), dr.getWkt());
if (map.size() == 0) {
return null;
}
@@ -152,11 +238,11 @@
String zipName = tempName + ".gdb.zip";
String zipFile = pathHelper.getDownloadFullPath() + File.separator + zipName;
- ZipFile zip = Zip4jHelper.createZipFile(zipFile, pwd);
+ ZipFile zip = Zip4jHelper.createZipFile(zipFile, dr.getPwd());
ZipParameters params = Zip4jHelper.getZipParams(true);
addZipFiles(zip, params, file.listFiles());
- String dbPwd = Md5Helper.reverse(Md5Helper.generate(pwd));
+ String dbPwd = Md5Helper.reverse(Md5Helper.generate(dr.getPwd()));
DownloadEntity downloadEntity = getDownloadEntity(ue, zipFile, dbPwd);
int rows = downloadMapper.insert(downloadEntity);
@@ -239,16 +325,20 @@
}
/**
- * 鎵撳寘DB鏁版嵁
+ * 璇锋眰DB鏁版嵁涓嬭浇-灞炴�ф煡璇�
*/
- public String zipDbData(UserEntity ue, String name, String depcode, String dirs, String filter, String pwd) throws Exception {
- BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
+ public String downloadDbReq4Prop(UserEntity ue, DownloadReqEntity dr) throws Exception {
+ String dirs = dr.getDirs();
+ String entity = dr.getEntities().get(0);
+ String depcode = null == dr.getDepcodes() || dr.getDepcodes().isEmpty() ? null : dr.getDepcodes().get(0);
+
+ BasicMapper baseMapper = ClassHelper.getBasicMapper(entity);
if (baseMapper == null) {
return null;
}
QueryWrapper wrapper = new QueryWrapper();
- baseQueryService.addFilterWrapper(wrapper, filter);
+ baseQueryService.addFilterWrapper(wrapper, dr.getFilter());
if (baseMapper instanceof GeomBaseMapper) {
wrapper.select("ST_AsText(geom) as geom, *");
}
@@ -267,13 +357,13 @@
}
String tab = BaseQueryService.getTabName(baseMapper);
- String ids = getAnnexFilter(StringHelper.isEmpty(depcode) && StringHelper.isEmpty(dirs) && StringHelper.isEmpty(filter), list);
+ String ids = getAnnexFilter(StringHelper.isEmpty(depcode) && StringHelper.isEmpty(dirs) && StringHelper.isEmpty(dr.getFilter()), list);
List<AttachEntity> annex = baseQueryService.selectAnnexByTab(tab, ids);
Map<String, List<?>> map = new HashMap<>(1);
- map.put(name, list);
+ map.put(entity, list);
- return zipData(ue, map, annex, pwd);
+ return zipData(ue, map, annex, dr.getPwd());
}
/**
--
Gitblit v1.9.3