From 303058307780d49e2ae4c815669f34b866206d86 Mon Sep 17 00:00:00 2001
From: dcb <xgybdcb@163.com>
Date: 星期四, 19 六月 2025 15:42:45 +0800
Subject: [PATCH] 根据位置查询，不提供时间则返回服务中所有符合条件的列表
---
src/main/java/com/se/nsl/controller/SimuController.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/se/nsl/controller/SimuController.java b/src/main/java/com/se/nsl/controller/SimuController.java
index 8477d8b..c790ff9 100644
--- a/src/main/java/com/se/nsl/controller/SimuController.java
+++ b/src/main/java/com/se/nsl/controller/SimuController.java
@@ -5,10 +5,8 @@
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.RealTimeInput;
-import com.se.nsl.domain.vo.SimuResult;
-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 io.swagger.annotations.Api;
@@ -39,6 +37,9 @@
@Resource
ResolveService resolveService;
+
+ @Resource
+ RealTimeSimulationService rts;
/**
* 鍒嗛〉鏌ヨ鎺ㄦ紨妯℃嫙
@@ -178,17 +179,22 @@
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("鏈煡鎵惧埌鐩稿叧鏁版嵁");
+ 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());
}
- return success(result);
}
@ApiOperation(value = "realTime")
@@ -223,4 +229,16 @@
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("瀹炴椂妯℃嫙寮傚父");
+ }
+ }
}
--
Gitblit v1.9.3