From 043d1bd4860bbee636b3935e94a71246091cbf3f Mon Sep 17 00:00:00 2001
From: dcb <xgybdcb@163.com>
Date: 星期二, 24 六月 2025 15:29:24 +0800
Subject: [PATCH] 实时模拟功能实现
---
src/main/java/com/se/nsl/controller/SimuController.java | 95 +++++++++++++++--------------------------------
1 files changed, 30 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/se/nsl/controller/SimuController.java b/src/main/java/com/se/nsl/controller/SimuController.java
index e7b52b0..f4d0076 100644
--- a/src/main/java/com/se/nsl/controller/SimuController.java
+++ b/src/main/java/com/se/nsl/controller/SimuController.java
@@ -9,9 +9,8 @@
import com.se.nsl.service.RealTimeSimulationService;
import com.se.nsl.service.ResolveService;
import com.se.nsl.service.SimuService;
+import com.se.nsl.utils.SimulateType;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.gdal.ogr.Geometry;
@@ -20,10 +19,6 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
import java.util.List;
@Api(tags = "03锛嶆帹婕旀ā鎷�")
@@ -105,10 +100,13 @@
int rows = simuService.insert(simu);
System.out.println(String.format("id:%s", simu.getId()));
-
- if (rows > 0 && (null == data.getRainfalls() || data.getRainfalls().size() < 2)) {
- resolveService.createRainfall(simu);
- simuService.updateById(simu);
+ Integer type = data.getType();
+ SimulateType simulateType = SimulateType.of(type);
+ if (simulateType == SimulateType.HISTORY) {
+ 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());
@@ -134,9 +132,16 @@
//if (simu.getStatus() != 0) return fail("鏂规姝ｅ湪杩愯鎴栧凡瀹屾垚");
if (StringUtils.isEmpty(simu.getGeom())) return fail("鏂规鐨勫浘褰负绌�");
- int rows = resolveService.start(simu);
-
- return success("ok");
+ Short type = simu.getType();
+ SimulateType simulateType = SimulateType.of(type);
+ if (simulateType == SimulateType.HISTORY) {
+ int rows = resolveService.start(simu);
+ return success("ok");
+ } else if (simulateType == SimulateType.REAL_TIME) {
+ String s = rts.realTimeSimulate(simu);
+ return success(s);
+ }
+ return fail("妯℃嫙绫诲瀷鏆備笉鏀寔");
} catch (Exception ex) {
return fail(ex, null);
}
@@ -179,61 +184,21 @@
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);
- }
-
- @ApiOperation(value = "realTime")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "date1", value = "5鍒嗛挓鍓嶇殑鏃堕棿锛屾牸寮忎负2025-05-31 14:15:20"),
- @ApiImplicitParam(name = "rainfall1", value = "5鍒嗛挓鍓嶇殑闄嶉洦寮哄害"),
- @ApiImplicitParam(name = "date2", value = "褰撳墠鏃堕棿锛屾牸寮忎负2025-05-31 14:20:20"),
- @ApiImplicitParam(name = "rainfall2", value = "褰撳墠鐨勯檷闆ㄥ己搴�"),
- @ApiImplicitParam(name = "serviceName", value = "鏈嶅姟鍚�")
- })
- @GetMapping("/realTime")
- public R<Object> realTimeSimulate(String date1, double rainfall1,
- String date2, double rainfall2, String serviceName) {
- RealTimeInput input = new RealTimeInput();
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- LocalDateTime t1 = LocalDateTime.parse(date1, formatter);
- LocalDateTime t2 = LocalDateTime.parse(date2, formatter);
- RealTimeInput.RealTimeData d1 = new RealTimeInput.RealTimeData();
- d1.setDateTime(t1);
- d1.setIntensity(rainfall1);
- RealTimeInput.RealTimeData d2 = new RealTimeInput.RealTimeData();
- d2.setDateTime(t2);
- d2.setIntensity(rainfall2);
- input.setData(Arrays.asList(d1, d2));
- input.setServiceName(serviceName);
-
- try {
- String layerJsonName = resolveService.realTimeSimulate(input);
- return success(layerJsonName);
- } catch (IOException e) {
- log.error("real-time simulate exception:", e);
- return fail("瀹炴椂妯℃嫙寮傚父");
- }
- }
-
- @ApiOperation(value = "realTime")
- @PostMapping("/realTime2")
- public R<Object> realTimeSimulate(@RequestBody RealTimeSimuParam param) {
- try {
- String layerJsonName = rts.realTimeSimulate(param);
- return success(layerJsonName);
- } catch (IOException e) {
- log.error("real-time simulate exception:", e);
- return fail("瀹炴椂妯℃嫙寮傚父");
+ if (time != null) {
+ SimuResult result = simuService.queryByPosition(lon, lat, time, serviceName);
+ if (result == null) {
+ return notFound("鏈煡鎵惧埌鐩稿叧鏁版嵁");
+ }
+ return success(result, 1);
+ } else {
+ List<SimuResult> simuResults = simuService.queryByPosition(lon, lat, serviceName);
+ if (simuResults.isEmpty()) {
+ return notFound("鏈煡鎵惧埌鐩稿叧鏁版嵁");
+ }
+ return success(simuResults, simuResults.size());
}
}
}
--
Gitblit v1.9.3