From 92fd3ce2a44b27dd931ee68a0f604e1af6d1b498 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 11 九月 2023 10:21:34 +0800
Subject: [PATCH] 修改栅格分析-1
---
src/main/java/com/moon/server/controller/data/RasterAnalysisController.java | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 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 58536b7..1d213f0 100644
--- a/src/main/java/com/moon/server/controller/data/RasterAnalysisController.java
+++ b/src/main/java/com/moon/server/controller/data/RasterAnalysisController.java
@@ -3,7 +3,7 @@
import com.moon.server.annotation.SysLog;
import com.moon.server.controller.all.BaseController;
import com.moon.server.entity.all.ResponseMsg;
-import com.moon.server.entity.data.ImageEntity;
+import com.moon.server.helper.StringHelper;
import com.moon.server.helper.WebHelper;
import com.moon.server.service.data.RasterAnalysisService;
import io.swagger.annotations.Api;
@@ -15,12 +15,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 鏍呮牸鍒嗘瀽
@@ -34,40 +30,32 @@
@Resource
RasterAnalysisService rasterService;
- @SysLog()
- @ApiOperation(value = "鏍规嵁geometry鑾峰彇瀵瑰簲鑼冨洿鐨勭伆搴﹀��")
- @PostMapping
- public ResponseMsg<Object> rasterAnalysis(@RequestBody List<ImageEntity> images) {
- // 杈撳叆鐨勫嚑浣旼eometry: POINT (75.772 2.498)
- String geometryString = images.get(0).getGeometryString();
- Geometry geometry = Geometry.CreateFromWkt(geometryString);
-
- for (ImageEntity i : images) {
- String path = i.getPath();
- if (geometry.GetGeometryType() == ogr.wkbPoint) {
- i.setResult(rasterService.processPoint(path, geometryString, i.getPointSize()));
- } else if (geometry.GetGeometryType() == ogr.wkbLineString) {
- i.setResult(rasterService.processLine(path, geometryString));
- } else if (geometry.GetGeometryType() == ogr.wkbPolygon) {
- i.setResult(rasterService.processPolygon(path, geometryString));
- }
- }
-
- return success(images);
- }
+ private final static List<Integer> pixels = new ArrayList<>(Arrays.asList(1, 2, 4, 8, 16, 32, 64, 128, 256));
@SysLog()
@ApiOperation(value = "鏌ヨ鐐瑰垎鏋�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "wkt", value = "鐐筗KT", dataType = "String", example = "")
+ @ApiImplicitParam(name = "wkt", value = "鐐筗KT", dataType = "String", example = "POINT (115.94927385452 32.3754479115071)"),
+ @ApiImplicitParam(name = "pixel", value = "鍍忕礌鍊�", dataType = "Integer", example = "1")
})
@GetMapping(value = "/selectByPoint")
- public ResponseMsg<Object> selectByPoint(String wkt) {
+ public ResponseMsg<Object> selectByPoint(String wkt, Integer pixel) {
try {
- Map<String, Double> map = new HashMap<>(5);
- map.put("鍥惧眰鍚�", 0.0);
+ // Map<String, Double> map = new HashMap<>(5); map.put("鍥惧眰鍚�", 0.0); return success(map)
+ if (StringHelper.isEmpty(wkt)) {
+ return fail("WKT瀛楃涓蹭笉鑳戒负绌�");
+ }
+ Geometry geo = Geometry.CreateFromWkt(wkt);
+ if (null == geo || geo.GetGeometryType() != ogr.wkbPoint) {
+ return fail("WKT瀛楃涓蹭笉姝ｇ‘");
+ }
+ if (null == pixel || !pixels.contains(pixel)) {
+ return fail("鍍忕偣鍊煎彧鑳戒负锛�" + StringHelper.join(pixels, ", "));
+ }
- return success(map);
+ List<?> rs = rasterService.analysisPoint(wkt, pixel);
+
+ return success(rs.size(), rs);
} catch (Exception ex) {
return fail(ex, null);
}
@@ -76,17 +64,22 @@
@SysLog()
@ApiOperation(value = "鏌ヨ绾垮垎鏋�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "wkt", value = "绾縒KT", dataType = "String", example = "")
+ @ApiImplicitParam(name = "wkt", value = "绾縒KT", dataType = "String", example = "LINESTRING(115.94927385452 32.3754479115071,121.989371092554 32.2766788010181,121.850621222894 29.6874200067864)")
})
@GetMapping(value = "/selectByPolyline")
public ResponseMsg<Object> selectByPolyline(String wkt) {
try {
- Map<String, List<Double>> map = new HashMap<>(5);
- List<Double> list = new ArrayList<>();
- list.add(0.0);
- map.put("鍥惧眰鍚�", list);
+ if (StringHelper.isEmpty(wkt)) {
+ return fail("WKT瀛楃涓蹭笉鑳戒负绌�");
+ }
+ Geometry geo = Geometry.CreateFromWkt(wkt);
+ if (null == geo || geo.GetGeometryType() != ogr.wkbLineString) {
+ return fail("WKT瀛楃涓蹭笉姝ｇ‘");
+ }
- return success(map);
+ List<?> rs = rasterService.analysisPolyline(wkt);
+
+ return success(rs.size(), rs);
} catch (Exception ex) {
return fail(ex, null);
}
@@ -95,15 +88,22 @@
@SysLog()
@ApiOperation(value = "鏌ヨ闈㈠垎鏋�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "wkt", value = "闈KT", dataType = "String", example = "")
+ @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))")
})
@GetMapping(value = "/selectByPolygon")
public ResponseMsg<Object> selectByPolygon(String wkt) {
try {
- Map<String, Double> map = new HashMap<>(5);
- map.put("鍥惧眰鍚�", 0.0);
+ if (StringHelper.isEmpty(wkt)) {
+ return fail("WKT瀛楃涓蹭笉鑳戒负绌�");
+ }
+ Geometry geo = Geometry.CreateFromWkt(wkt);
+ if (null == geo || geo.GetGeometryType() != ogr.wkbPolygon) {
+ return fail("WKT瀛楃涓蹭笉姝ｇ‘");
+ }
- return success(map);
+ List<?> rs = rasterService.analysisPolygon(wkt);
+
+ return success(rs.size(), rs);
} catch (Exception ex) {
return fail(ex, null);
}
--
Gitblit v1.9.3