From f7c642eed8ae076553f95a1f0ac5fd2e7c31b6a1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 31 十月 2024 18:00:37 +0800
Subject: [PATCH] 修改返回值

---
 src/main/java/com/se/simu/controller/WaterController.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/se/simu/controller/WaterController.java b/src/main/java/com/se/simu/controller/WaterController.java
index 68e77d5..d0f2df3 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.R;
 import com.se.simu.helper.WebHelper;
 import com.se.simu.service.SimuService;
 import com.se.simu.service.WaterService;
@@ -28,7 +29,7 @@
 @Slf4j
 @RestController
 @RequestMapping("/waterlogging")
-public class WaterController {
+public class WaterController extends BaseController {
     @Resource
     SimuService simuService;
 
@@ -134,7 +135,7 @@
             @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) {
+    public R<Double> getWaterHeight(@PathVariable String serviceName, double x, double y, long timestamp, HttpServletResponse res) {
         try {
             SimuPo simu = simuService.getSimuByServiceName(serviceName);
             if (null == simu) {
@@ -142,10 +143,10 @@
             }
 
             // 鏍规嵁鏈嶅姟鍚�+鏃堕棿鎴�+鍧愭爣锛屾煡璇㈠搴旂殑绉按娣卞害
-            return waterService.getWaterHeight(simu, x, y, timestamp);
+            return success(waterService.getWaterHeight(simu, x, y, timestamp));
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
-            return null;
+            return fail(ex);
         }
     }
 

--
Gitblit v1.9.3