From a394db1cdcd8c3f1dc1bbaf808bf6865fd7d54b9 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 06 四月 2023 15:51:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseQueryService.java | 24 ++++++++++++++++++------
1 files changed, 18 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 68d5495..f1ce04b 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;
@@ -17,6 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -37,7 +39,7 @@
/**
* 琛ㄥ悕Map
*/
- private static Map<String, String> tabMap = new HashMap<String, String>(3);
+ private static Map<String, String> tabMap = new HashMap<>(3);
/**
* 娣诲姞杩囨护鏉′欢
@@ -123,6 +125,9 @@
break;
case "<=":
wrapper.le(field, val);
+ break;
+ case "in":
+ wrapper.in(field, Arrays.asList(val.toString().split(",")));
break;
default:
break;
@@ -220,34 +225,36 @@
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);
}
@@ -274,8 +281,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