From c738483367653c6485ddc9a6dcdea019ad08cc63 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 31 十月 2024 17:44:02 +0800
Subject: [PATCH] 根据坐标查询积水深度

---
 src/main/java/com/se/simu/controller/WaterController.java |   20 +++++++++++++++++---
 1 files changed, 17 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 fea5fc0..68e77d5 100644
--- a/src/main/java/com/se/simu/controller/WaterController.java
+++ b/src/main/java/com/se/simu/controller/WaterController.java
@@ -1,8 +1,12 @@
 package com.se.simu.controller;
 
+import com.se.simu.domain.po.SimuPo;
 import com.se.simu.helper.WebHelper;
+import com.se.simu.service.SimuService;
 import com.se.simu.service.WaterService;
 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.springframework.http.HttpStatus;
@@ -25,6 +29,9 @@
 @RestController
 @RequestMapping("/waterlogging")
 public class WaterController {
+    @Resource
+    SimuService simuService;
+
     @Resource
     WaterService waterService;
 
@@ -121,14 +128,21 @@
 
     @ApiOperation(value = "鏍规嵁鍧愭爣鏌ヨ绉按娣卞害")
     @GetMapping("/{serviceName}/getWaterHeight")
-    public Double getWaterHeight(@PathVariable String serviceName, Double x, Double y, Long timestamp, HttpServletResponse res) {
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "serviceName", value = "鏈嶅姟鍚�", dataType = "String", paramType = "path", example = "20241010095328"),
+            @ApiImplicitParam(name = "x", value = "X", dataType = "double", paramType = "query", example = "116.6447998"),
+            @ApiImplicitParam(name = "y", value = "Y", dataType = "double", paramType = "query", example = "39.8868915"),
+            @ApiImplicitParam(name = "timestamp", value = "鏃堕棿鎴�", dataType = "long", paramType = "query", example = "1730217660000")
+    })
+    public Double getWaterHeight(@PathVariable String serviceName, double x, double y, long timestamp, HttpServletResponse res) {
         try {
-            if (!validate(serviceName, res)) {
+            SimuPo simu = simuService.getSimuByServiceName(serviceName);
+            if (null == simu) {
                 return null;
             }
 
             // 鏍规嵁鏈嶅姟鍚�+鏃堕棿鎴�+鍧愭爣锛屾煡璇㈠搴旂殑绉按娣卞害
-            return waterService.getWaterHeight(serviceName, x, y, timestamp);
+            return waterService.getWaterHeight(simu, x, y, timestamp);
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
             return null;

--
Gitblit v1.9.3