From 05b7f36c1fdb1dae4fd2131f63e10f72f85ee42c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 03 四月 2023 16:49:14 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseQueryService.java | 58 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 19 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 c138848..65a9fe6 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -7,8 +7,8 @@
import com.lf.server.entity.ctrl.KeyValueEntity;
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.DictEntity;
-import com.lf.server.entity.data.DirEntity;
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;
@@ -38,7 +38,7 @@
/**
* 琛ㄥ悕Map
*/
- private static Map<String, String> tabMap = new HashMap<String, String>(3);
+ private static Map<String, String> tabMap = new HashMap<>(3);
/**
* 娣诲姞杩囨护鏉′欢
@@ -104,7 +104,7 @@
switch (express) {
case "like":
- wrapper.like(field, val);
+ wrapper.like("UPPER(" + field + ")", val.toString().toUpperCase());
break;
case ">":
wrapper.gt(field, val);
@@ -209,37 +209,50 @@
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 List<TabEntity> selectTabs() {
- return baseQueryMapper.selectTabs();
+ public Integer selectTabsForCount(String tab, String field) {
+ tab = StringHelper.getLikeUpperStr(tab);
+
+ return baseQueryMapper.selectTabsForCount(tab, field);
}
@Override
- public Integer selectTabsForCount(String tab) {
- tab = StringHelper.getLikeStr(tab);
+ public List<TabEntity> selectTabsByPage(String tab, String field, String filters, Integer limit, Integer offset) {
+ tab = StringHelper.getLikeUpperStr(tab);
- return baseQueryMapper.selectTabsForCount(tab);
- }
-
- @Override
- public List<TabEntity> selectTabsByPage(String tab, Integer limit, Integer offset) {
- tab = StringHelper.getLikeStr(tab);
-
- return baseQueryMapper.selectTabsByPage(tab, limit, offset);
+ return baseQueryMapper.selectTabsByPage(tab, field, filters, limit, offset);
}
@Override
@@ -263,7 +276,14 @@
}
@Override
- public List<DirEntity> selectBaseType() {
- return baseQueryMapper.selectBaseType();
+ public List<KeyValueEntity> selectDirTypes(String 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