From ac20dc99bf1f463365dba071973e08fffbd294b4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 14 七月 2023 14:12:21 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseQueryService.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/lf/server/service/all/BaseQueryService.java b/src/main/java/com/lf/server/service/all/BaseQueryService.java
index 86a5f3c..5b2a31e 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -170,9 +170,7 @@
wkt = AesHelper.decrypt(wkt);
Integer srid = getSrid((GeomBaseMapper) basicMapper);
- 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)", wkt, srid));
}
}
@@ -192,9 +190,10 @@
}
Integer srid = basicMapper.selectSrid(tab);
- if (srid != null) {
- redisService.put(key, srid, 5, TimeUnit.MINUTES);
+ if (null == srid) {
+ return StaticData.I4490;
}
+ redisService.put(key, srid, 5, TimeUnit.MINUTES);
return srid;
}
@@ -245,9 +244,6 @@
*/
public void addBufferWrapper(GeomBaseMapper baseMapper, QueryWrapper wrapper, String wkt, double buffer) {
Integer srid = getSrid(baseMapper);
- if (null == srid) {
- srid = 4490;
- }
// buffer = buffer * 0.00000899928
buffer = buffer / 1852 / 60;
@@ -269,17 +265,17 @@
}
@Override
- public Integer selectTabsForCount(String tab, String field) {
+ public Integer selectTabsForCount(String tab, String typesFilter, String field) {
tab = StringHelper.getLikeUpperStr(tab);
- return baseQueryMapper.selectTabsForCount(tab, field);
+ return baseQueryMapper.selectTabsForCount(tab, typesFilter, field);
}
@Override
- public List<TabEntity> selectTabsByPage(String tab, String field, String filters, Integer limit, Integer offset) {
+ public List<TabEntity> selectTabsByPage(String tab, String typesFilter, String field, String filters, Integer limit, Integer offset) {
tab = StringHelper.getLikeUpperStr(tab);
- return baseQueryMapper.selectTabsByPage(tab, field, filters, limit, offset);
+ return baseQueryMapper.selectTabsByPage(tab, typesFilter, field, filters, limit, offset);
}
@Override
--
Gitblit v1.9.3