From e53252b99e7b49b435b7a6ee3eab21ae1bd7a055 Mon Sep 17 00:00:00 2001
From: dcb <xgybdcb@163.com>
Date: 星期三, 09 七月 2025 16:11:40 +0800
Subject: [PATCH] 断面分析功能实现
---
src/main/java/com/se/nsl/controller/SimuController.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/se/nsl/controller/SimuController.java b/src/main/java/com/se/nsl/controller/SimuController.java
index f289da9..9ca589b 100644
--- a/src/main/java/com/se/nsl/controller/SimuController.java
+++ b/src/main/java/com/se/nsl/controller/SimuController.java
@@ -10,6 +10,7 @@
import com.se.nsl.utils.SimulateType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.gdal.ogr.Geometry;
import org.gdal.ogr.ogr;
@@ -205,24 +206,40 @@
@ApiOperation(value = "crossSection")
@GetMapping("/crossSection")
- public R<Object> crossSection(String serviceName, double[] startPoint, double[] endPoint) {
+ public R<Object> crossSection(@Parameter(description = "鏂规id锛岀ず渚嬶細50") Integer id,
+ @Parameter(description = "鏃堕棿鎴筹紝绀轰緥锛�1751552400000") Long time,
+ @Parameter(description = "璧风偣鍧愭爣锛岀ず渚嬶細116.59049537485063,40.564178548127686") String startPoint,
+ @Parameter(description = "缁堢偣鍧愭爣锛岀ず渚嬶細116.5901406492509,40.56499045715429") String endPoint) {
+ if (null == id || id < 1) return clientError("id涓嶈兘涓虹┖");
+ Simu simu = simuService.selectById(id);
+ if (simu == null) {
+ return clientError("鎵句笉鍒板搴旂殑鏈嶅姟");
+ }
+ String serviceName = simu.getServiceName();
if (serviceName == null) {
- return clientError("鏈嶅姟鍚嶄笉鑳戒负绌�");
+ return fail("鎵句笉鍒板搴旂殑鏈嶅姟");
}
if (startPoint == null) {
return clientError("璧风偣涓嶈兘涓虹┖");
}
- if (startPoint.length < 2) {
- return clientError("璧风偣鑷冲皯鍖呭惈x,y涓や釜鍊�");
- }
if (endPoint == null) {
return clientError("缁堢偣涓嶈兘涓虹┖");
}
- if (endPoint.length < 2) {
- return clientError("缁堢偣鑷冲皯鍖呭惈x,y涓や釜鍊�");
+ String[] sp = startPoint.split(",");
+ double[] s = new double[] {Double.parseDouble(sp[0]), Double.parseDouble(sp[1])};
+ String[] ep = endPoint.split(",");
+ double[] e = new double[] {Double.parseDouble(ep[0]), Double.parseDouble(ep[1])};
+ try {
+ if (time == null) {
+ List<CrossSectionAnalysisResult> result = scas.crossSectionAnalysis(serviceName, s, e);
+ return success(result, result.size());
+ } else {
+ CrossSectionAnalysisResult res = scas.crossSectionAnalysis(serviceName, s, e, time);
+ return success(res, 1);
+ }
+ } catch (IllegalArgumentException ex) {
+ return fail(ex.getMessage(), null);
}
- List<CrossSectionAnalysisResult> result = scas.crossSectionAnalysis(serviceName, startPoint, endPoint);
- return success(result);
}
@ApiOperation(value = "stop")
--
Gitblit v1.9.3