From ef335a55c9d9e15e23beec9ec9c2c075fd21a15a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 22 二月 2023 18:32:35 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseQueryService.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 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..f171389 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -4,16 +4,17 @@
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;
+import com.lf.server.entity.data.MetaEntity;
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.ClassHelper;
import com.lf.server.helper.StringHelper;
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,7 +97,7 @@
* @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;
}
@@ -142,7 +143,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));
+ }
}
}
@@ -233,10 +236,10 @@
}
@Override
- public List<TabEntity> selectTabsByPage(String tab, Integer limit, Integer offset) {
+ public List<TabEntity> selectTabsByPage(String tab, String filters, Integer limit, Integer offset) {
tab = StringHelper.getLikeStr(tab);
- return baseQueryMapper.selectTabsByPage(tab, limit, offset);
+ return baseQueryMapper.selectTabsByPage(tab, filters, limit, offset);
}
@Override
@@ -248,4 +251,29 @@
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> selectBaseType() {
+ return baseQueryMapper.selectBaseType();
+ }
+
+ @Override
+ public List<KeyValueEntity> selectBusinessType() {
+ return baseQueryMapper.selectBusinessType();
+ }
+
+ @Override
+ public List<KeyValueEntity> selectProject() {
+ return baseQueryMapper.selectProject();
+ }
}
--
Gitblit v1.9.3