From d475b695564c548b0980c8c0d0d2428a2a7b112e Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 13 九月 2023 15:15:40 +0800
Subject: [PATCH] 栅格分析结果添加坐标点位
---
src/main/java/com/moon/server/controller/data/RasterAnalysisController.java | 74 ++++++-------------------------------
1 files changed, 12 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/data/RasterAnalysisController.java b/src/main/java/com/moon/server/controller/data/RasterAnalysisController.java
index 2939ae2..3da5c79 100644
--- a/src/main/java/com/moon/server/controller/data/RasterAnalysisController.java
+++ b/src/main/java/com/moon/server/controller/data/RasterAnalysisController.java
@@ -4,7 +4,6 @@
import com.moon.server.controller.all.BaseController;
import com.moon.server.entity.all.ResponseMsg;
import com.moon.server.helper.StringHelper;
-import com.moon.server.helper.WebHelper;
import com.moon.server.service.data.RasterAnalysisService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -15,7 +14,6 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import java.util.*;
/**
@@ -35,13 +33,12 @@
@SysLog()
@ApiOperation(value = "鏌ヨ鐐瑰垎鏋�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "wkt", value = "鐐筗KT", dataType = "String", example = "POINT (115.94927385452 32.3754479115071)"),
+ @ApiImplicitParam(name = "wkt", value = "鐐筗KT", dataType = "String", example = "POINT (157.750107 29.036669)"),
@ApiImplicitParam(name = "pixel", value = "鍍忕礌鍊�", dataType = "Integer", example = "1")
})
@GetMapping(value = "/selectByPoint")
public ResponseMsg<Object> selectByPoint(String wkt, Integer pixel) {
try {
- // Map<String, Double> map = new HashMap<>(5); map.put("鍥惧眰鍚�", 0.0); return success(map)
if (StringHelper.isEmpty(wkt)) {
return fail("WKT瀛楃涓蹭笉鑳戒负绌�");
}
@@ -50,10 +47,10 @@
return fail("WKT瀛楃涓蹭笉姝ｇ‘");
}
if (null == pixel || !PIXELS.contains(pixel)) {
- return fail("鍍忕偣鍊煎彧鑳戒负锛�" + StringHelper.join(PIXELS, ", "));
+ return fail("鍍忕礌鍊煎彧鑳戒负锛�" + StringHelper.join(PIXELS, ", "));
}
- List<?> rs = rasterService.analysisPoint(geo, pixel);
+ List<?> rs = rasterService.analysis(geo, pixel);
return success(rs.size(), rs);
} catch (Exception ex) {
@@ -64,10 +61,11 @@
@SysLog()
@ApiOperation(value = "鏌ヨ绾垮垎鏋�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "wkt", value = "绾縒KT", dataType = "String", example = "LINESTRING(115.94927385452 32.3754479115071,121.989371092554 32.2766788010181,121.850621222894 29.6874200067864)")
+ @ApiImplicitParam(name = "wkt", value = "绾縒KT", dataType = "String", example = "LINESTRING(165.680851 31.333443,166.383982 31.283475,166.016355 30.908709)"),
+ @ApiImplicitParam(name = "pixel", value = "鍍忕礌鍊�", dataType = "Integer", example = "1")
})
@GetMapping(value = "/selectByPolyline")
- public ResponseMsg<Object> selectByPolyline(String wkt) {
+ public ResponseMsg<Object> selectByPolyline(String wkt, Integer pixel) {
try {
if (StringHelper.isEmpty(wkt)) {
return fail("WKT瀛楃涓蹭笉鑳戒负绌�");
@@ -76,8 +74,11 @@
if (null == geo || geo.GetGeometryType() != ogr.wkbLineString) {
return fail("WKT瀛楃涓蹭笉姝ｇ‘");
}
+ if (null == pixel || !PIXELS.contains(pixel)) {
+ return fail("鍍忕礌鍊煎彧鑳戒负锛�" + StringHelper.join(PIXELS, ", "));
+ }
- List<?> rs = rasterService.analysisPolyline(geo);
+ List<?> rs = rasterService.analysis(geo, pixel);
return success(rs.size(), rs);
} catch (Exception ex) {
@@ -88,7 +89,7 @@
@SysLog()
@ApiOperation(value = "鏌ヨ闈㈠垎鏋�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "wkt", value = "闈KT", dataType = "String", example = "POLYGON ((115.94927385452 32.3754479115071,121.989371092554 32.2766788010181,121.850621222894 29.6874200067864,115.9727267226 29.7835368627922,115.94927385452 32.3754479115071))")
+ @ApiImplicitParam(name = "wkt", value = "闈KT", dataType = "String", example = "POLYGON ((165.680851 31.333443,166.383982 31.283475,166.016355 30.908709,165.680851 31.333443))")
})
@GetMapping(value = "/selectByPolygon")
public ResponseMsg<Object> selectByPolygon(String wkt) {
@@ -101,62 +102,11 @@
return fail("WKT瀛楃涓蹭笉姝ｇ‘");
}
- List<?> rs = rasterService.analysisPolygon(geo);
+ List<?> rs = rasterService.analysis(geo, 0);
return success(rs.size(), rs);
} catch (Exception ex) {
return fail(ex, null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "涓嬭浇鐐瑰垎鏋�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "wkt", value = "鐐筗KT", dataType = "String", example = "")
- })
- @GetMapping(value = "/downloadByPoint")
- public void downloadByPoint(String wkt, HttpServletResponse res) {
- try {
- // ...
-
- String filePath = "鐢熸垚鏂囦欢鐨勮矾寰�";
- WebHelper.download(filePath, "鏂囦欢鍚�", res);
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "涓嬭浇绾垮垎鏋�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "wkt", value = "绾縒KT", dataType = "String", example = "")
- })
- @GetMapping(value = "/downloadByPolyline")
- public void downloadByPolyline(String wkt, HttpServletResponse res) {
- try {
- // ...
-
- String filePath = "鐢熸垚鏂囦欢鐨勮矾寰�";
- WebHelper.download(filePath, "鏂囦欢鍚�", res);
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "涓嬭浇闈㈠垎鏋�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "wkt", value = "闈KT", dataType = "String", example = "")
- })
- @GetMapping(value = "/downloadByPolygon")
- public void downloadByPolygon(String wkt, HttpServletResponse res) {
- try {
- // ...
-
- String filePath = "鐢熸垚鏂囦欢鐨勮矾寰�";
- WebHelper.download(filePath, "鏂囦欢鍚�", res);
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
}
}
}
--
Gitblit v1.9.3