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 | 110 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 76 insertions(+), 34 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 951ee45..65a9fe6 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -2,12 +2,13 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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.sys.AttachEntity;
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.ClassHelper;
import com.lf.server.helper.StringHelper;
@@ -15,7 +16,6 @@
import com.lf.server.mapper.all.BasicMapper;
import com.lf.server.mapper.all.GeomBaseMapper;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.cache.RedisCache;
import org.springframework.stereotype.Service;
import java.util.HashMap;
@@ -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);
/**
* 娣诲姞杩囨护鏉′欢
@@ -73,19 +73,19 @@
/**
* 鑾峰彇鍊煎璞�
*
- * @param value 鍊�
+ * @param val 鍊�
* @return 瀵硅薄
*/
- private Object getObjectVal(String value) {
- if (StringHelper.isInteger(value)) {
- return Long.parseLong(value);
+ private Object getObjectVal(String val) {
+ if (StringHelper.isInteger(val)) {
+ return Long.parseLong(val);
}
- if (StringHelper.isNumeric(value)) {
- return Double.parseDouble(value);
+ if (StringHelper.isNumeric(val)) {
+ return Double.parseDouble(val);
}
- return value.replace("'", "");
+ return val.replace("'", "");
}
/**
@@ -94,31 +94,36 @@
* @param wrapper QueryWrapper
* @param field 瀛楁
* @param express 琛ㄨ揪寮�
- * @param value 鍊�
+ * @param val 鍊�
*/
- private void addWrapper(QueryWrapper wrapper, String field, String express, Object value) {
+ private void addWrapper(QueryWrapper wrapper, String field, String express, Object val) {
+ if (StringHelper.isDate(val.toString())) {
+ wrapper.apply(String.format("%s %s '%s'", field, express, val));
+ return;
+ }
+
switch (express) {
case "like":
- wrapper.like(field, value);
+ wrapper.like("UPPER(" + field + ")", val.toString().toUpperCase());
break;
case ">":
- wrapper.gt(field, value);
+ wrapper.gt(field, val);
break;
case ">=":
- wrapper.ge(field, value);
+ wrapper.ge(field, val);
break;
case "<>":
case "!=":
- wrapper.ne(field, value);
+ wrapper.ne(field, val);
break;
case "=":
- wrapper.eq(field, value);
+ wrapper.eq(field, val);
break;
case "<":
- wrapper.lt(field, value);
+ wrapper.lt(field, val);
break;
case "<=":
- wrapper.le(field, value);
+ wrapper.le(field, val);
break;
default:
break;
@@ -138,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));
+ }
}
}
@@ -202,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
@@ -244,4 +264,26 @@
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.getLikeUpperStr(name);
+
+ return baseQueryMapper.selectDirTypes(name);
+ }
+
+ @Override
+ public List<AttachEntity> selectAnnexByTab(String tab, String gids) {
+ return baseQueryMapper.selectAnnexByTab(tab, gids);
+ }
}
--
Gitblit v1.9.3