From 0217e80b8630f199c8a54c1fb6a8342cea9bb75f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 28 二月 2023 11:09:12 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/data/ProjectController.java |   76 ++++++++++++++++++++++++++------------
 1 files changed, 52 insertions(+), 24 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 ebb4474..8234443 100644
--- a/src/main/java/com/lf/server/controller/data/ProjectController.java
+++ b/src/main/java/com/lf/server/controller/data/ProjectController.java
@@ -1,9 +1,13 @@
 package com.lf.server.controller.data;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lf.server.annotation.SysLog;
 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;
@@ -24,9 +28,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 椤圭洰绠＄悊
@@ -59,41 +61,49 @@
             List<DepEntity> list = depService.selectDepAll();
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ鎵�鏈夌洰褰曟暟鎹�")
-    @GetMapping(value = "/selectDirAll")
-    public ResponseMsg<List<DirEntity>> selectDirAll() {
+    @ApiOperation(value = "鏌ヨ椤圭洰")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "瑗�")
+    })
+    @GetMapping(value = "/selectProject")
+    public ResponseMsg<List<DirEntity>> selectProject(String name) {
         try {
-            List<DirEntity> list = dirService.selectDirAll();
+            List<DirEntity> list = dirService.selectProject(name);
+
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
     @SysLog()
-    @ApiOperation(value = "鏍规嵁鐩綍ID鏌ヨ")
+    @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "int", paramType = "query", example = "0")
+            @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "String", paramType = "query", example = "1"),
+            @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
+            @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
-    @GetMapping(value = "/selectByDirid")
-    public ResponseMsg<BsprojectEntity> selectByDirid(int dirid) {
+    @GetMapping(value = "/selectByPageAndCount")
+    public ResponseMsg<Object> selectByPageAndCount(String dirid, Integer pageSize, Integer pageIndex) {
         try {
-            Map<String, Object> map = new HashMap<>(1);
-            map.put("dirid", dirid);
-
-            List<BsprojectEntity> list = bsprojectMapper.selectByMap(map);
-            if (null == list || list.isEmpty()) {
-                return success(null);
+            QueryWrapper<BsprojectEntity> wrapper = new QueryWrapper<>();
+            wrapper.select("ST_AsText(geom) as geom, *");
+            if (null != dirid) {
+                wrapper.eq("dirid", dirid);
             }
 
-            return success(list.get(0));
+            Page<BsprojectEntity> page = new Page<>(pageIndex, pageSize);
+            page.addOrder(OrderItem.asc("gid"));
+            Page paged = bsprojectMapper.selectPage(page, wrapper);
+
+            return success(paged.getTotal(), paged.getRecords());
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -112,7 +122,25 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
+        }
+    }
+
+    @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, null);
         }
     }
 
@@ -128,7 +156,7 @@
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -156,7 +184,7 @@
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -185,7 +213,7 @@
 
             return success(rows);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 }

--
Gitblit v1.9.3