From 71726a1cb05790d6841595ef7daef5173f2cddfa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 29 三月 2023 09:43:11 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseQueryService.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 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 286df38..65a9fe6 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -8,6 +8,7 @@
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.DictEntity;
import com.lf.server.entity.data.DomainEntity;
+import com.lf.server.entity.sys.AttachEntity;
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.ClassHelper;
import com.lf.server.helper.StringHelper;
@@ -37,7 +38,7 @@
/**
* 琛ㄥ悕Map
*/
- private static Map<String, String> tabMap = new HashMap<String, String>(3);
+ private static Map<String, String> tabMap = new HashMap<>(3);
/**
* 娣诲姞杩囨护鏉′欢
@@ -208,30 +209,48 @@
return tabName;
}
+ /**
+ * 娣诲姞缂撳啿鍖鸿繃婊ゆ潯浠�
+ *
+ * @param baseMapper 鐖禡apper
+ * @param wrapper QueryWrapper
+ * @param wkt WKT锛堣憲鍚嶆枃鏈級
+ */
+ 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;
+
+ wrapper.apply(String.format("ST_Intersects(geom, ST_Buffer(ST_GeomFromText('%s', %d), %f, 'endcap=round join=round'))", wkt, srid, buffer));
+ }
+
@Override
public List<IdNameEntity> selectUserFuzzy(String name) {
- name = StringHelper.getLikeStr(name);
+ name = StringHelper.getLikeUpperStr(name);
return baseQueryMapper.selectUserFuzzy(name);
}
@Override
public List<IdNameEntity> selectDepFuzzy(String name) {
- name = StringHelper.getLikeStr(name);
+ name = StringHelper.getLikeUpperStr(name);
return baseQueryMapper.selectDepFuzzy(name);
}
@Override
public Integer selectTabsForCount(String tab, String field) {
- tab = StringHelper.getLikeStr(tab);
+ tab = StringHelper.getLikeUpperStr(tab);
return baseQueryMapper.selectTabsForCount(tab, field);
}
@Override
public List<TabEntity> selectTabsByPage(String tab, String field, String filters, Integer limit, Integer offset) {
- tab = StringHelper.getLikeStr(tab);
+ tab = StringHelper.getLikeUpperStr(tab);
return baseQueryMapper.selectTabsByPage(tab, field, filters, limit, offset);
}
@@ -258,8 +277,13 @@
@Override
public List<KeyValueEntity> selectDirTypes(String name) {
- name = StringHelper.getLikeStr(name);
+ name = StringHelper.getLikeUpperStr(name);
return baseQueryMapper.selectDirTypes(name);
}
+
+ @Override
+ public List<AttachEntity> selectAnnexByTab(String tab, String gids) {
+ return baseQueryMapper.selectAnnexByTab(tab, gids);
+ }
}
--
Gitblit v1.9.3