From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/service/all/BaseQueryService.java | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 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..94a4e38 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -61,12 +61,30 @@
continue;
}
- String field = str.substring(0, start).trim();
+ String field = convertFiled(str.substring(0, start).trim());
String express = str.substring(start + 1, end).trim().toLowerCase();
String value = str.substring(end + 1).trim();
addWrapper(wrapper, field, express, getObjectVal(express, value));
}
+ }
+
+ /**
+ * 瀛楁杞崲
+ */
+ private String convertFiled(String field) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0, c = field.length(); i < c; i++) {
+ char ch = field.charAt(i);
+ if (Character.isUpperCase(ch)) {
+ sb.append('_');
+ sb.append(Character.toLowerCase(ch));
+ } else {
+ sb.append(ch);
+ }
+ }
+
+ return sb.toString();
}
/**
@@ -170,9 +188,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 +208,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 +262,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 +283,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
@@ -310,6 +324,11 @@
}
@Override
+ public List<KeyValueEntity> selectDirsByTypes(String[] types, String dirs) {
+ return baseQueryMapper.selectDirsByTypes(types, dirs);
+ }
+
+ @Override
public List<AttachEntity> selectAnnexByTab(String tab, String gids) {
return baseQueryMapper.selectAnnexByTab(tab, gids);
}
--
Gitblit v1.9.3