From b6899cd6d1bafb1c349f1fbd190e6632183719f5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 01 十一月 2024 20:44:00 +0800
Subject: [PATCH] 11
---
src/main/java/com/se/simu/controller/WaterController.java | 71 ++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/WaterController.java b/src/main/java/com/se/simu/controller/WaterController.java
index e745217..d0f2df3 100644
--- a/src/main/java/com/se/simu/controller/WaterController.java
+++ b/src/main/java/com/se/simu/controller/WaterController.java
@@ -1,9 +1,13 @@
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.SedbService;
+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;
@@ -16,18 +20,18 @@
import javax.servlet.http.HttpServletResponse;
/**
- * 鍐呮稘鎺у埗鍣�
+ * 鍐呮稘绠＄悊
*
* @author WWW
* @date 2024-07-16
*/
-@Api(tags = "鍐呮稘鎺у埗鍣�")
+@Api(tags = "鍐呮稘绠＄悊")
@Slf4j
@RestController
@RequestMapping("/waterlogging")
-public class WaterController {
+public class WaterController extends BaseController {
@Resource
- SedbService sedbService;
+ SimuService simuService;
@Resource
WaterService waterService;
@@ -37,12 +41,6 @@
private final static int MAX_SIZE = 80000;
private final static long Y2000 = 949334400000L;
-
- @ApiOperation(value = "鑾峰彇褰撳墠鏃堕棿")
- @GetMapping("/getTime")
- public Object getTime() {
- return System.currentTimeMillis();
- }
@ApiOperation(value = "鑾峰彇鍏冩暟鎹俊鎭�")
@GetMapping("/{serviceName}/layer.json")
@@ -112,6 +110,46 @@
}
}
+ @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")
+ @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 R<Double> 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));
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ return fail(ex);
+ }
+ }
+
private boolean validate(String serviceName, HttpServletResponse res) {
if (WebHelper.isEmpty(serviceName)) {
return WebHelper.writeJson2Page(res, HttpStatus.BAD_REQUEST, "鏈嶅姟鍚嶄笉鑳戒负绌�");
@@ -142,16 +180,5 @@
}
return true;
- }
-
- @ApiOperation(value = "* 娴嬭瘯 *")
- @GetMapping("/test")
- public Object test() {
- try {
- return sedbService.test();
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
- return ex.getMessage();
- }
}
}
--
Gitblit v1.9.3