From 7ce82b491f9cd097fe70aae37d1ad3dff3779e72 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 21 二月 2023 14:24:43 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/ProjectController.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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..4528200 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;
@@ -65,11 +66,11 @@
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鏍圭洰褰�")
- @GetMapping(value = "/selectDirRoot")
- public ResponseMsg<List<DirEntity>> selectDirRoot() {
+ @ApiOperation(value = "鏌ヨ椤圭洰")
+ @GetMapping(value = "/selectProject")
+ public ResponseMsg<List<DirEntity>> selectProject() {
try {
- List<DirEntity> list = dirService.selectDirRoot();
+ List<DirEntity> list = dirService.selectProject();
return success(list);
} catch (Exception ex) {
@@ -80,16 +81,16 @@
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
- @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1"),
+ @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 = "/selectByPageAndCount")
- public ResponseMsg<Object> selectByPageAndCount(Integer dirid, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<Object> selectByPageAndCount(String 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