From 51d12c4cca7c9d4911a0037673bbd2dc210836d0 Mon Sep 17 00:00:00 2001
From: dcb <xgybdcb@163.com>
Date: 星期五, 20 六月 2025 10:17:12 +0800
Subject: [PATCH] 根据位置查询Bug修复
---
src/main/java/com/se/nsl/controller/SimuController.java | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 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 484f60f..fc5389d 100644
--- a/src/main/java/com/se/nsl/controller/SimuController.java
+++ b/src/main/java/com/se/nsl/controller/SimuController.java
@@ -5,11 +5,13 @@
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 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;
@@ -18,6 +20,10 @@
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锛嶆帹婕旀ā鎷�")
@@ -31,6 +37,9 @@
@Resource
ResolveService resolveService;
+
+ @Resource
+ RealTimeSimulationService rts;
/**
* 鍒嗛〉鏌ヨ鎺ㄦ紨妯℃嫙
@@ -163,20 +172,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