From d91c78e445e49cda5430bd33ef281f60f56a0a2d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 05 二月 2023 20:09:10 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/data/ProjectController.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/data/ProjectController.java b/src/main/java/com/lf/server/controller/data/ProjectController.java
index a327c34..28e8fe7 100644
--- a/src/main/java/com/lf/server/controller/data/ProjectController.java
+++ b/src/main/java/com/lf/server/controller/data/ProjectController.java
@@ -7,6 +7,7 @@
 import com.lf.server.controller.all.BaseController;
 import com.lf.server.entity.all.ResponseMsg;
 import com.lf.server.entity.bs.BsprojectEntity;
+import com.lf.server.entity.ctrl.KeyValueEntity;
 import com.lf.server.entity.data.DictEntity;
 import com.lf.server.entity.data.DirEntity;
 import com.lf.server.entity.sys.DepEntity;
@@ -87,9 +88,9 @@
     @GetMapping(value = "/selectByPageAndCount")
     public ResponseMsg<Object> selectByPageAndCount(Integer dirid, Integer pageSize, Integer pageIndex) {
         try {
-            QueryWrapper<BsprojectEntity> wrapper = null;
+            QueryWrapper<BsprojectEntity> wrapper = new QueryWrapper<>();
+            wrapper.select("ST_AsText(geom) as geom, *");
             if (null != dirid) {
-                wrapper = new QueryWrapper<>();
                 wrapper.eq("dirid", dirid);
             }
 
@@ -123,6 +124,24 @@
     }
 
     @SysLog()
+    @ApiOperation(value = "鏌ヨ浣嶇疆")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "x", value = "X", dataType = "Double", paramType = "query", example = "114.178955"),
+            @ApiImplicitParam(name = "y", value = "Y", dataType = "Double", paramType = "query", example = "38.991743")
+    })
+    @GetMapping(value = "/selectLocation")
+    public ResponseMsg<Object> selectLocation(double x, double y) {
+        try {
+            String wkt = String.format("POINT(%f %f)", x, y);
+            List<KeyValueEntity> list = baseQueryService.selectLocation(wkt);
+
+            return success(list);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
+
+    @SysLog()
     @ApiOperation(value = "鍒犻櫎涓�鏉�")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "gid", value = "ID", dataType = "int", paramType = "query", example = "1")

--
Gitblit v1.9.3