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 | 45 ---------------------------------------------
src/main/java/com/se/nsl/service/SimuService.java | 2 ++
2 files changed, 2 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/se/nsl/controller/SimuController.java b/src/main/java/com/se/nsl/controller/SimuController.java
index c790ff9..fc5389d 100644
--- a/src/main/java/com/se/nsl/controller/SimuController.java
+++ b/src/main/java/com/se/nsl/controller/SimuController.java
@@ -196,49 +196,4 @@
return success(simuResults, simuResults.size());
}
}
-
- @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("瀹炴椂妯℃嫙寮傚父");
- }
- }
}
diff --git a/src/main/java/com/se/nsl/service/SimuService.java b/src/main/java/com/se/nsl/service/SimuService.java
index 31b0834..ccc2b3d 100644
--- a/src/main/java/com/se/nsl/service/SimuService.java
+++ b/src/main/java/com/se/nsl/service/SimuService.java
@@ -223,6 +223,8 @@
File depthDir = depthPath.toFile();
File[] files = depthDir.listFiles();
for (File tifFile : files) {
+ String name = tifFile.getName();
+ if (!name.endsWith(TIF_EXTSION)) continue;
ColumnRow cr = getColumnRow(tifFile, x, y);
if (cr == null) continue;
float depth = readPixelValue(cr.dataset, cr.col, cr.row, 1);
--
Gitblit v1.9.3