From 90b5e3ce5a1fade99c63db8a37bf86b1c090415c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 23 十二月 2022 11:22:43 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseQueryService.java | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 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 5f554f1..6177aa8 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -2,7 +2,6 @@
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.TabEntity;
@@ -14,8 +13,8 @@
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.data.redis.cache.RedisCache;
import org.springframework.stereotype.Service;
import java.util.HashMap;
@@ -73,19 +72,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,30 +93,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(field, val);
break;
case ">":
- wrapper.gt(field, value);
+ wrapper.gt(field, val);
break;
case ">=":
- wrapper.ge(field, value);
+ wrapper.ge(field, val);
break;
case "<>":
- wrapper.ne(field, value);
+ case "!=":
+ 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;
@@ -147,7 +152,7 @@
* @param basicMapper 绌洪棿鍩虹Mapper
* @return SRID
*/
- private Integer getSrid(GeomBaseMapper basicMapper) {
+ public Integer getSrid(GeomBaseMapper basicMapper) {
String tab = getTabName(basicMapper);
String key = RedisCacheKey.sridKey(tab);
@@ -221,6 +226,20 @@
}
@Override
+ public Integer selectTabsForCount(String tab) {
+ 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);
+ }
+
+ @Override
public List<DictEntity> selectFields(String ns, String tab) {
return baseQueryMapper.selectFields(ns, tab);
}
--
Gitblit v1.9.3