From 118ae24754f526c318b14a6c2af1badf3b7d90de Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 二月 2023 16:03:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/DataLibService.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 534cf03..9fca96d 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;
}
@@ -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;
--
Gitblit v1.9.3