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 | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/se/nsl/controller/SimuController.java b/src/main/java/com/se/nsl/controller/SimuController.java
index 484f60f..f4d0076 100644
--- a/src/main/java/com/se/nsl/controller/SimuController.java
+++ b/src/main/java/com/se/nsl/controller/SimuController.java
@@ -5,10 +5,11 @@
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.SimuVo;
+import com.se.nsl.domain.vo.*;
+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.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -31,6 +32,9 @@
@Resource
ResolveService resolveService;
+
+ @Resource
+ RealTimeSimulationService rts;
/**
* 鍒嗛〉鏌ヨ鎺ㄦ紨妯℃嫙
@@ -96,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());
@@ -125,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);
}
@@ -163,20 +177,28 @@
@ApiOperation(value = "position")
@GetMapping("/position")
- public R<Object> queryByPosition(double lon, double lat, String time, String serviceName) {
+ public R<Object> queryByPosition(double lon, double lat, Long time, String serviceName) {
if (lon > 180 || lon < -180) {
- return fail("缁忓害鑼冨洿搴旇鍦�-180鍒�180");
+ return clientError("缁忓害鑼冨洿搴旇鍦�-180鍒�180");
}
if (lat > 90 || lat < -90) {
- return fail("绾害鑼冨洿搴旇鍦�-90鍒�90");
- }
- if (time == null || time.trim().isEmpty()) {
- return fail("鏃堕棿鎴充笉鑳戒负绌�");
+ return clientError("绾害鑼冨洿搴旇鍦�-90鍒�90");
}
if (serviceName == null || serviceName.trim().isEmpty()) {
- return fail("鏈嶅姟鍚嶄笉鑳戒负绌�");
+ return clientError("鏈嶅姟鍚嶄笉鑳戒负绌�");
}
-
- return null;
+ 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