From a6fe405947004d6571806edabd8f14357e144cfa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 14 十月 2024 17:31:31 +0800
Subject: [PATCH] 1
---
src/main/java/com/se/simu/controller/WaterController.java | 52 +++++++++++++++++++---------------------------------
1 files changed, 19 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/WaterController.java b/src/main/java/com/se/simu/controller/WaterController.java
index c40b73b..6d25649 100644
--- a/src/main/java/com/se/simu/controller/WaterController.java
+++ b/src/main/java/com/se/simu/controller/WaterController.java
@@ -1,8 +1,9 @@
package com.se.simu.controller;
-import com.se.simu.domain.LayerVo;
import com.se.simu.helper.WebHelper;
import com.se.simu.service.WaterService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.GetMapping;
@@ -12,14 +13,14 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
-import java.io.File;
/**
- * 鍐呮稘鎺у埗鍣�
+ * 鍐呮稘绠＄悊
*
* @author WWW
* @date 2024-07-16
*/
+@Api(tags = "鍐呮稘绠＄悊")
@Slf4j
@RestController
@RequestMapping("/waterlogging")
@@ -33,11 +34,7 @@
private final static long Y2000 = 949334400000L;
- @GetMapping("/getTime")
- public Object getTime() {
- return System.currentTimeMillis();
- }
-
+ @ApiOperation(value = "鑾峰彇鍏冩暟鎹俊鎭�")
@GetMapping("/{serviceName}/layer.json")
public void getLayer(@PathVariable String serviceName, HttpServletResponse res) {
try {
@@ -45,15 +42,16 @@
return;
}
- LayerVo layer = waterService.getLayer(serviceName);
+ byte[] bytes = waterService.getLayerJson(serviceName);
- WebHelper.writeJson2Page(res, HttpStatus.OK, layer);
+ 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}/terrain")
public void getTerraMap(@PathVariable String serviceName, Integer width, Integer height, HttpServletResponse res) {
try {
@@ -62,13 +60,15 @@
}
String file = waterService.getTerraMap(serviceName, width, height);
- writeFile(file, res);
+
+ WebHelper.writePng(file, res);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
WebHelper.writeStr2Page(res, HttpStatus.INTERNAL_SERVER_ERROR, ex.getMessage());
}
}
+ @ApiOperation(value = "鑾峰彇姘撮潰楂樺害鍥�")
@GetMapping("/{serviceName}/waterMap")
public void getWaterMap(@PathVariable String serviceName, Integer width, Integer height, Long timestamp, HttpServletResponse res) {
try {
@@ -76,14 +76,16 @@
return;
}
- String file = waterService.getWaterMap(serviceName, width, height);
- writeFile(file, res);
+ String file = waterService.getWaterMap(serviceName, width, height, timestamp);
+
+ WebHelper.writePng(file, res);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
WebHelper.writeStr2Page(res, HttpStatus.INTERNAL_SERVER_ERROR, ex.getMessage());
}
}
+ @ApiOperation(value = "鑾峰彇姘存祦鍚戞祦閫熷浘")
@GetMapping("/{serviceName}/flowMap")
public void getFlowMap(@PathVariable String serviceName, Integer width, Integer height, Long timestamp, HttpServletResponse res) {
try {
@@ -92,7 +94,8 @@
}
String file = waterService.getFlowMap(serviceName, width, height, timestamp);
- writeFile(file, res);
+
+ WebHelper.writePng(file, res);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
WebHelper.writeStr2Page(res, HttpStatus.INTERNAL_SERVER_ERROR, ex.getMessage());
@@ -124,26 +127,9 @@
if (null == height || height < MIN_SIZE || height > MAX_SIZE) {
return WebHelper.writeJson2Page(res, HttpStatus.BAD_REQUEST, "鍥惧儚楂樺害涓嶈兘涓虹┖涓斿彇鍊艰寖鍥翠负" + MIN_SIZE + "~" + MAX_SIZE + "涔嬮棿");
}
- if (null == timestamp || timestamp < Y2000) {
- return WebHelper.writeJson2Page(res, HttpStatus.BAD_REQUEST, "鏃堕棿涓嶈兘涓虹┖涓斿ぇ浜�2000骞�");
+ if (null == timestamp || timestamp < 0) {
+ return WebHelper.writeJson2Page(res, HttpStatus.BAD_REQUEST, "鏃堕棿涓嶈兘涓虹┖涓斿ぇ浜�0");
}
-
- return true;
- }
-
- /**
- * 鍐欐枃浠�
- */
- private boolean writeFile(String path, HttpServletResponse res) throws Exception {
- if (WebHelper.isEmpty(path)) {
- return WebHelper.writeJson2Page(res, HttpStatus.INTERNAL_SERVER_ERROR, "鐢熸垚PNG澶辫触");
- }
- File file = new File(path);
- if (!file.exists() || file.isDirectory()) {
- return WebHelper.writeJson2Page(res, HttpStatus.INTERNAL_SERVER_ERROR, "PNG鏂囦欢鎵句笉鍒�");
- }
-
- WebHelper.download(path, file.getName(), res);
return true;
}
--
Gitblit v1.9.3