From 84a874883f190fb8022382ff591e50b5bb049690 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 06 十一月 2024 16:50:16 +0800
Subject: [PATCH] 1
---
src/main/java/com/se/simu/controller/WaterController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/WaterController.java b/src/main/java/com/se/simu/controller/WaterController.java
index 4befa5a..4df2535 100644
--- a/src/main/java/com/se/simu/controller/WaterController.java
+++ b/src/main/java/com/se/simu/controller/WaterController.java
@@ -1,6 +1,7 @@
package com.se.simu.controller;
import com.se.simu.domain.po.SimuPo;
+import com.se.simu.domain.vo.PondingVo;
import com.se.simu.domain.vo.R;
import com.se.simu.helper.StringHelper;
import com.se.simu.helper.WebHelper;
@@ -153,15 +154,17 @@
@ApiImplicitParam(name = "timestamp", value = "鏃堕棿鎴�", dataType = "long", paramType = "query", example = "1730217660000")
})
@GetMapping("/{serviceName}/getWaterHeight")
- public R<Double> getWaterHeight(@PathVariable String serviceName, double x, double y, long timestamp, HttpServletResponse res) {
+ public R<Object> getWaterHeight(@PathVariable String serviceName, double x, double y, long timestamp, HttpServletResponse res) {
try {
SimuPo simu = simuService.getSimuByServiceName(serviceName);
if (null == simu) {
return null;
}
- // 鏍规嵁鏈嶅姟鍚�+鏃堕棿鎴�+鍧愭爣锛屾煡璇㈠搴旂殑绉按娣卞害
- return success(waterService.getWaterHeight(simu, x, y, timestamp));
+ Double depth = waterService.getWaterHeight(simu, x, y, timestamp);
+ Double area = waterService.getWaterArea(simu, x, y, timestamp);
+
+ return success(new PondingVo(depth, area));
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
return fail(ex);
--
Gitblit v1.9.3