From 5826bfa3f502f47f46b37b2e18f0b2f90af691a0 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 30 十月 2024 17:00:11 +0800
Subject: [PATCH] 1

---
 src/main/java/com/se/simu/controller/WaterController.java |   40 ++++++++++++++++++++++++++++++++++------
 1 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/se/simu/controller/WaterController.java b/src/main/java/com/se/simu/controller/WaterController.java
index f391f72..d9b633f 100644
--- a/src/main/java/com/se/simu/controller/WaterController.java
+++ b/src/main/java/com/se/simu/controller/WaterController.java
@@ -34,12 +34,6 @@
 
     private final static long Y2000 = 949334400000L;
 
-    @ApiOperation(value = "鑾峰彇褰撳墠鏃堕棿")
-    @GetMapping("/getTime")
-    public Object getTime() {
-        return System.currentTimeMillis();
-    }
-
     @ApiOperation(value = "鑾峰彇鍏冩暟鎹俊鎭�")
     @GetMapping("/{serviceName}/layer.json")
     public void getLayer(@PathVariable String serviceName, HttpServletResponse res) {
@@ -108,6 +102,40 @@
         }
     }
 
+    @ApiOperation(value = "鑾峰彇闄嶆按鏇茬嚎鏂囦欢鏇茬嚎鍥�")
+    @GetMapping("/{serviceName}/rainfall.json")
+    public void getRainfall(@PathVariable String serviceName, HttpServletResponse res) {
+        try {
+            if (!validate(serviceName, res)) {
+                return;
+            }
+
+            byte[] bytes = waterService.getRainfall(serviceName);
+
+            WebHelper.writeBytes(bytes, res);
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+            WebHelper.writeStr2Page(res, HttpStatus.INTERNAL_SERVER_ERROR, ex.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "鏍规嵁鍧愭爣鏌ヨ绉按娣卞害")
+    @GetMapping("/{serviceName}/getWaterHeight")
+    public Double getWaterHeight(@PathVariable String serviceName, Double x, Double y, Long timestamp, HttpServletResponse res) {
+        try {
+            if (!validate(serviceName, res)) {
+                return null;
+            }
+
+            // 鏍规嵁鏈嶅姟鍚�+鏃堕棿鎴�+鍧愭爣锛屾煡璇㈠搴旂殑绉按娣卞害
+
+            return 0.0;
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+            return null;
+        }
+    }
+
     private boolean validate(String serviceName, HttpServletResponse res) {
         if (WebHelper.isEmpty(serviceName)) {
             return WebHelper.writeJson2Page(res, HttpStatus.BAD_REQUEST, "鏈嶅姟鍚嶄笉鑳戒负绌�");

--
Gitblit v1.9.3