From abb772e08beb75ec1f915921b779168133a5ce54 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 11 九月 2023 21:18:51 +0800
Subject: [PATCH] 解决栅格分析的线查询失败

---
 src/main/java/com/moon/server/controller/data/RasterAnalysisController.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 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 d1281b0..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.*;
 
 /**
@@ -49,7 +47,7 @@
                 return fail("WKT瀛楃涓蹭笉姝g‘");
             }
             if (null == pixel || !PIXELS.contains(pixel)) {
-                return fail("鍍忕偣鍊煎彧鑳戒负锛�" + StringHelper.join(PIXELS, ", "));
+                return fail("鍍忕礌鍊煎彧鑳戒负锛�" + StringHelper.join(PIXELS, ", "));
             }
 
             List<?> rs = rasterService.analysis(geo, pixel);
@@ -63,10 +61,11 @@
     @SysLog()
     @ApiOperation(value = "鏌ヨ绾垮垎鏋�")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "wkt", value = "绾縒KT", dataType = "String", example = "LINESTRING(165.680851 31.333443,166.383982 31.283475,166.016355 30.908709)")
+            @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瀛楃涓蹭笉鑳戒负绌�");
@@ -75,8 +74,11 @@
             if (null == geo || geo.GetGeometryType() != ogr.wkbLineString) {
                 return fail("WKT瀛楃涓蹭笉姝g‘");
             }
+            if (null == pixel || !PIXELS.contains(pixel)) {
+                return fail("鍍忕礌鍊煎彧鑳戒负锛�" + StringHelper.join(PIXELS, ", "));
+            }
 
-            List<?> rs = rasterService.analysis(geo, 0);
+            List<?> rs = rasterService.analysis(geo, pixel);
 
             return success(rs.size(), rs);
         } catch (Exception ex) {

--
Gitblit v1.9.3