From 7b2459ba1c1f14c06f17914f3d53ebcd6e2641a3 Mon Sep 17 00:00:00 2001
From: wuww <252740454@qq.com>
Date: 星期五, 16 五月 2025 17:27:51 +0800
Subject: [PATCH] 解决土地利用裁剪后使用异常
---
src/main/java/com/se/nsl/controller/SimuController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/se/nsl/controller/SimuController.java b/src/main/java/com/se/nsl/controller/SimuController.java
index f4df136..0028a67 100644
--- a/src/main/java/com/se/nsl/controller/SimuController.java
+++ b/src/main/java/com/se/nsl/controller/SimuController.java
@@ -11,6 +11,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.gdal.ogr.Geometry;
+import org.gdal.ogr.ogr;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -85,8 +87,17 @@
SimuData data = JSON.parseObject(simu.getData(), SimuData.class);
if (null == data) return fail("data鏁版嵁鏍煎紡(JSON)涓嶆纭�");
+ if (StringUtils.isEmpty(simu.getGeom())) return fail("geom瀛楃涓蹭笉鏄疻KT鏍煎紡");
+
+ Geometry geom = Geometry.CreateFromWkt(simu.getGeom());
+ if (!(geom.GetGeometryType() == ogr.wkbMultiPolygon || geom.GetGeometryType() == ogr.wkbPolygon))
+ return fail("geom瀵硅薄涓嶆槸澶氳竟褰�");
int rows = simuService.insert(simu);
+ if (rows > 0 && (null == data.getRainfalls() || data.getRainfalls().size() < 2)) {
+ resolveService.createRainfall(simu);
+ simuService.updateById(simu);
+ }
return success(rows);
} catch (Exception ex) {
@@ -107,7 +118,8 @@
SimuData data = JSON.parseObject(simu.getData(), SimuData.class);
if (null == data) return fail("鏂规鏁版嵁鏍煎紡(JSON)涓嶆纭�");
- if (simu.getStatus() != 0) return fail("鏂规姝ｅ湪杩愯鎴栧凡瀹屾垚");
+ //if (simu.getStatus() != 0) return fail("鏂规姝ｅ湪杩愯鎴栧凡瀹屾垚");
+ if (StringUtils.isEmpty(simu.getGeom())) return fail("鏂规鐨勫浘褰负绌�");
int rows = resolveService.start(simu);
@@ -127,6 +139,18 @@
@PutMapping(value = "/updateById", produces = "application/json; charset=UTF-8")
public R<Object> updateById(@RequestBody Simu simu) {
try {
+ if (StringUtils.isEmpty(simu.getData())) return fail("data涓虹┖");
+
+ SimuData data = JSON.parseObject(simu.getData(), SimuData.class);
+ if (null == data) return fail("data鏁版嵁鏍煎紡(JSON)涓嶆纭�");
+ if (StringUtils.isEmpty(simu.getGeom())) return fail("geom瀛楃涓蹭笉鏄疻KT鏍煎紡");
+
+ Geometry geom = Geometry.CreateFromWkt(simu.getGeom());
+ if (!(geom.GetGeometryType() == ogr.wkbMultiPolygon || geom.GetGeometryType() == ogr.wkbPolygon))
+ return fail("geom瀵硅薄涓嶆槸澶氳竟褰�");
+
+ if (null == data.getRainfalls() || data.getRainfalls().size() < 2) resolveService.createRainfall(simu);
+
return success(simuService.updateById(simu));
} catch (Exception ex) {
return fail(ex, null);
--
Gitblit v1.9.3