From 0816d0ea55506747a76ac915c20b0ff7ca33600a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 03 三月 2023 21:26:11 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseQueryService.java | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 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 6177aa8..286df38 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.lf.server.entity.all.RedisCacheKey;
import com.lf.server.entity.ctrl.IdNameEntity;
+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.DomainEntity;
@@ -13,7 +14,6 @@
import com.lf.server.mapper.all.BaseQueryMapper;
import com.lf.server.mapper.all.BasicMapper;
import com.lf.server.mapper.all.GeomBaseMapper;
-import io.netty.resolver.AbstractAddressResolver;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -96,14 +96,14 @@
* @param val 鍊�
*/
private void addWrapper(QueryWrapper wrapper, String field, String express, Object val) {
- if (StringHelper.isDate(val.toString())){
+ if (StringHelper.isDate(val.toString())) {
wrapper.apply(String.format("%s %s '%s'", field, express, val));
return;
}
switch (express) {
case "like":
- wrapper.like(field, val);
+ wrapper.like("UPPER(" + field + ")", val.toString().toUpperCase());
break;
case ">":
wrapper.gt(field, val);
@@ -142,7 +142,9 @@
wkt = AesHelper.decrypt(wkt);
Integer srid = getSrid((GeomBaseMapper) basicMapper);
- wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", wkt, srid));
+ if (null != srid) {
+ wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", wkt, srid));
+ }
}
}
@@ -221,22 +223,17 @@
}
@Override
- public List<TabEntity> selectTabs() {
- return baseQueryMapper.selectTabs();
+ public Integer selectTabsForCount(String tab, String field) {
+ tab = StringHelper.getLikeStr(tab);
+
+ return baseQueryMapper.selectTabsForCount(tab, field);
}
@Override
- public Integer selectTabsForCount(String tab) {
+ public List<TabEntity> selectTabsByPage(String tab, String field, String filters, Integer limit, Integer offset) {
tab = StringHelper.getLikeStr(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
@@ -248,4 +245,21 @@
public List<DomainEntity> selectDomains(String ns, String tab) {
return baseQueryMapper.selectDomains(ns, tab);
}
+
+ @Override
+ public String selectRoute(double x1, double y1, double x2, double y2) {
+ return baseQueryMapper.selectRoute(x1, y1, x2, y2);
+ }
+
+ @Override
+ public List<KeyValueEntity> selectLocation(String wkt) {
+ return baseQueryMapper.selectLocation(wkt);
+ }
+
+ @Override
+ public List<KeyValueEntity> selectDirTypes(String name) {
+ name = StringHelper.getLikeStr(name);
+
+ return baseQueryMapper.selectDirTypes(name);
+ }
}
--
Gitblit v1.9.3