From 495292b588949bcb2cb15eaa9657619aca7f5579 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 30 十月 2024 16:18:41 +0800
Subject: [PATCH] 修改降雨文件的jar
---
src/main/java/com/se/simu/controller/WaterController.java | 68 +++++++++++++++------------------
1 files changed, 31 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/WaterController.java b/src/main/java/com/se/simu/controller/WaterController.java
index 32a55a3..cbeaa71 100644
--- a/src/main/java/com/se/simu/controller/WaterController.java
+++ b/src/main/java/com/se/simu/controller/WaterController.java
@@ -1,7 +1,5 @@
package com.se.simu.controller;
-import com.se.simu.domain.LayerVo;
-import com.se.simu.helper.StringHelper;
import com.se.simu.helper.WebHelper;
import com.se.simu.service.WaterService;
import io.swagger.annotations.Api;
@@ -15,10 +13,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
-import java.io.File;
/**
- * 鍐呮稘鎺у埗鍣�
+ * 鍐呮稘绠＄悊
*
* @author WWW
* @date 2024-07-16
@@ -37,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) {
@@ -51,9 +42,9 @@
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());
@@ -69,7 +60,8 @@
}
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());
@@ -84,8 +76,9 @@
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());
@@ -101,7 +94,25 @@
}
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());
+ }
+ }
+
+ @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());
@@ -109,7 +120,7 @@
}
private boolean validate(String serviceName, HttpServletResponse res) {
- if (StringHelper.isEmpty(serviceName)) {
+ if (WebHelper.isEmpty(serviceName)) {
return WebHelper.writeJson2Page(res, HttpStatus.BAD_REQUEST, "鏈嶅姟鍚嶄笉鑳戒负绌�");
}
@@ -124,7 +135,7 @@
* 楠岃瘉
*/
private boolean validate(String serviceName, Integer width, Integer height, Long timestamp, HttpServletResponse res) {
- if (StringHelper.isEmpty(serviceName)) {
+ if (WebHelper.isEmpty(serviceName)) {
return WebHelper.writeJson2Page(res, HttpStatus.BAD_REQUEST, "鏈嶅姟鍚嶄笉鑳戒负绌�");
}
if (null == width || width < MIN_SIZE || width > MAX_SIZE) {
@@ -133,26 +144,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 (StringHelper.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