From b25ba75d2e0c60242d0f9195f0820db470485c61 Mon Sep 17 00:00:00 2001
From: dcb <xgybdcb@163.com>
Date: 星期二, 27 五月 2025 11:27:08 +0800
Subject: [PATCH] 新增根据点位查询水深流速接口
---
src/main/java/com/se/nsl/controller/SimuController.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 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 3abe23e..0aa1c78 100644
--- a/src/main/java/com/se/nsl/controller/SimuController.java
+++ b/src/main/java/com/se/nsl/controller/SimuController.java
@@ -1,16 +1,20 @@
package com.se.nsl.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.se.nsl.domain.po.Simu;
import com.se.nsl.domain.po.SimuData;
import com.se.nsl.domain.vo.R;
+import com.se.nsl.domain.vo.SimuResult;
import com.se.nsl.domain.vo.SimuVo;
import com.se.nsl.service.ResolveService;
import com.se.nsl.service.SimuService;
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,10 +89,22 @@
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);
+ System.out.println(String.format("id:%s", simu.getId()));
- return success(rows);
+ if (rows > 0 && (null == data.getRainfalls() || data.getRainfalls().size() < 2)) {
+ resolveService.createRainfall(simu);
+ simuService.updateById(simu);
+ }
+ JSONObject json = new JSONObject();
+ json.put("id", simu.getId());
+ return success(json);
} catch (Exception ex) {
return fail(ex, null);
}
@@ -128,9 +144,43 @@
@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);
}
}
+
+ @ApiOperation(value = "position")
+ @GetMapping("/position")
+ public R<Object> queryByPosition(double lon, double lat, Long time, String serviceName) {
+ if (lon > 180 || lon < -180) {
+ return clientError("缁忓害鑼冨洿搴旇鍦�-180鍒�180");
+ }
+ if (lat > 90 || lat < -90) {
+ return clientError("绾害鑼冨洿搴旇鍦�-90鍒�90");
+ }
+ if (time == null) {
+ return clientError("鏃堕棿鎴充笉鑳戒负绌�");
+ }
+ if (serviceName == null || serviceName.trim().isEmpty()) {
+ return clientError("鏈嶅姟鍚嶄笉鑳戒负绌�");
+ }
+ SimuResult result = simuService.queryByPosition(lon, lat, time, serviceName);
+ if (result == null) {
+ return notFound("鏈煡鎵惧埌鐩稿叧鏁版嵁");
+ }
+ return success(result);
+ }
}
--
Gitblit v1.9.3