From 1991cda18d5675f754e3960b6de95a0089bf7440 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 20 三月 2023 16:02:03 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/all/BaseQueryController.java |   79 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index 42f5448..65d5dfc 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lf.server.annotation.SysLog;
 import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.all.StaticData;
 import com.lf.server.entity.ctrl.DownloadReqEntity;
 import com.lf.server.entity.ctrl.IdNameEntity;
 import com.lf.server.entity.ctrl.KeyValueEntity;
@@ -145,13 +146,35 @@
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp"),
             @ApiImplicitParam(name = "wkt", value = "WKT锛堣憲鍚嶆枃鏈級", dataType = "String", paramType = "query", example = ""),
+            @ApiImplicitParam(name = "buffer", value = "缂撳啿鍖哄ぇ灏�", dataType = "Double", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "limit", value = "闄愬埗鏉℃暟", dataType = "Integer", paramType = "query", example = "20")
     })
     @GetMapping(value = "/selectByBuffer")
-    public ResponseMsg<List<Object>> selectByBuffer(String name, String wkt, Integer limit) {
+    public ResponseMsg<List<?>> selectByBuffer(String name, String wkt, Double buffer, Integer limit) {
         try {
+            if (StringHelper.isEmpty(wkt)) {
+                return fail("WKT涓嶈兘涓虹┖", null);
+            }
+            if (null == limit || limit < 1 || limit > StaticData.ONE_HUNDRED) {
+                limit = 20;
+            }
+            if (null == buffer || buffer < 0 || buffer > StaticData.ONE_HUNDRED_THOUSAND) {
+                buffer = 10.0;
+            }
 
-            return success(0, null);
+            GeomBaseMapper baseMapper = ClassHelper.getGeoBaseMapper(name);
+            if (baseMapper == null) {
+                return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+            }
+
+            QueryWrapper wrapper = new QueryWrapper();
+            wrapper.select("ST_AsText(geom) as geom, *");
+            baseQueryService.addBufferWrapper(baseMapper, wrapper, wkt, buffer);
+            wrapper.last("limit " + limit);
+
+            List<?> list = baseMapper.selectList(wrapper);
+
+            return success(null == list ? 0 : list.size(), list);
         } catch (Exception ex) {
             return fail(ex, null);
         }
@@ -219,6 +242,53 @@
     }
 
     @SysLog()
+    @ApiOperation(value = "鏍规嵁GID鏌ヨ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp"),
+            @ApiImplicitParam(name = "gid", value = "GID", dataType = "int", paramType = "query", example = "1")
+    })
+    @GetMapping(value = "/selectByGid")
+    public ResponseMsg<Object> selectByGid(String name, int gid) {
+        try {
+            GeomBaseMapper baseMapper = ClassHelper.getGeoBaseMapper(name);
+            if (baseMapper == null) {
+                return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+            }
+
+            QueryWrapper wrapper = new QueryWrapper();
+            wrapper.select("ST_AsText(geom) as geom, *");
+            wrapper.eq("gid", gid);
+
+            Object obj = baseMapper.selectOne(wrapper);
+
+            return success(null == obj ? 0 : 1, obj);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏍规嵁瀹炰綋鍚嶆煡璇㈣〃鍚�")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp")
+    })
+    @GetMapping(value = "/selectTabByEntity")
+    public ResponseMsg<Object> selectTabByEntity(String name) {
+        try {
+            BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
+            if (baseMapper == null) {
+                return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+            }
+
+            String tab = BaseQueryService.getTabName(baseMapper);
+
+            return success(tab);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
+    @SysLog()
     @ApiOperation(value = "妯＄硦鎼滅储瀛楁")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp"),
@@ -240,11 +310,8 @@
             if (StringHelper.isEmpty(field) || StringHelper.isSqlInjection(field)) {
                 return fail("鏌ヨ瀛楁涓嶆纭�", null);
             }
-            if (!StringHelper.isEmpty(value)) {
-                value = value.trim().replace("'", "");
-            }
 
-            value = StringHelper.getLikeStr2(value);
+            value = StringHelper.isEmpty(value) ? "%" : StringHelper.getLikeUpperStr(value);
             List<String> rs = baseMapper.selectFieldFuzzy(tab, field, value);
 
             return success(rs);

--
Gitblit v1.9.3