From 222f719b70c70f8ed816f37c829d0d62a3c9d1e8 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 03 三月 2023 09:59:39 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/all/BaseQueryService.java |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 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 2dd6b2a..6108e95 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;
 
@@ -223,11 +223,6 @@
     }
 
     @Override
-    public List<TabEntity> selectTabs() {
-        return baseQueryMapper.selectTabs();
-    }
-
-    @Override
     public Integer selectTabsForCount(String tab) {
         tab = StringHelper.getLikeStr(tab);
 
@@ -235,10 +230,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
@@ -255,4 +250,16 @@
     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