From dd6183027575e9a335a7d4f2d145aec947969a34 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 24 十二月 2022 10:44:43 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/DataLibService.java | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 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 9835765..2f4e354 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -16,10 +16,7 @@
import org.springframework.stereotype.Service;
import java.io.File;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 璧勬枡棣�
@@ -40,6 +37,54 @@
BaseQueryService baseQueryService;
private final static Log log = LogFactory.getLog(DataLibService.class);
+
+ /**
+ * 鏌ヨDB涓孩鍑虹殑鍗曚綅ID
+ */
+ public List<Integer> selectDbOverflowDep(UserEntity ue, List<String> entities, String wkt) {
+ List<Integer> rs = new ArrayList<>();
+ for (String enity : entities) {
+ try {
+ GeomBaseMapper<?> baseMapper = ClassHelper.getGeoBaseMapper(enity);
+ 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()));
+
+ Integer srid = baseQueryService.getSrid(baseMapper);
+ if (null != srid) {
+ wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", wkt, srid));
+ }
+
+ List<Integer> ids = baseMapper.selectList(wrapper);
+
+ addDepIds(rs, ids);
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+ }
+
+ return rs;
+ }
+
+ /**
+ * 娣诲姞鍗曚綅ID
+ */
+ private void addDepIds(List<Integer> rs, List<Integer> ids) {
+ if (null == ids || ids.isEmpty()) {
+ return;
+ }
+
+ for (Integer id : ids) {
+ if (!rs.contains(id)) {
+ rs.add(id);
+ }
+ }
+ }
/**
* 鍒涘缓Zip鍖�
@@ -82,7 +127,7 @@
Map<String, List<?>> map = new HashMap<>(5);
for (String enity : entities) {
try {
- GeomBaseMapper baseMapper = ClassHelper.getGeoBaseMapper(enity);
+ GeomBaseMapper<?> baseMapper = ClassHelper.getGeoBaseMapper(enity);
if (null == baseMapper) {
continue;
}
@@ -97,7 +142,7 @@
map.put(enity, list);
}
} catch (Exception ex) {
- //
+ log.error(ex.getMessage(), ex);
}
}
@@ -110,8 +155,11 @@
private QueryWrapper createWrapper(GeomBaseMapper baseMapper, String wkt) {
QueryWrapper wrapper = new QueryWrapper();
wrapper.select("ST_AsText(geom) as geom, *");
+
Integer srid = baseQueryService.getSrid(baseMapper);
- wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", wkt, srid));
+ if (null != srid) {
+ wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", wkt, srid));
+ }
return wrapper;
}
--
Gitblit v1.9.3