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 | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/WaterController.java b/src/main/java/com/se/simu/controller/WaterController.java
index cd9e4bc..6d25649 100644
--- a/src/main/java/com/se/simu/controller/WaterController.java
+++ b/src/main/java/com/se/simu/controller/WaterController.java
@@ -1,6 +1,5 @@
package com.se.simu.controller;
-import com.se.simu.helper.StringHelper;
import com.se.simu.helper.WebHelper;
import com.se.simu.service.WaterService;
import io.swagger.annotations.Api;
@@ -16,7 +15,7 @@
import javax.servlet.http.HttpServletResponse;
/**
- * 鍐呮稘鎺у埗鍣�
+ * 鍐呮稘绠＄悊
*
* @author WWW
* @date 2024-07-16
@@ -31,15 +30,9 @@
private final static int MIN_SIZE = 10;
- private final static int MAX_SIZE = 10000000;
+ 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")
@@ -49,7 +42,9 @@
return;
}
- //
+ byte[] bytes = waterService.getLayerJson(serviceName);
+
+ WebHelper.writeBytes(bytes, res);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
WebHelper.writeStr2Page(res, HttpStatus.INTERNAL_SERVER_ERROR, ex.getMessage());
@@ -64,7 +59,9 @@
return;
}
- //
+ String file = waterService.getTerraMap(serviceName, width, height);
+
+ WebHelper.writePng(file, res);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
WebHelper.writeStr2Page(res, HttpStatus.INTERNAL_SERVER_ERROR, ex.getMessage());
@@ -79,7 +76,9 @@
return;
}
- //
+ 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());
@@ -94,7 +93,9 @@
return;
}
- //
+ String file = waterService.getFlowMap(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());
@@ -102,8 +103,8 @@
}
private boolean validate(String serviceName, HttpServletResponse res) {
- if (StringHelper.isEmpty(serviceName)) {
- return WebHelper.writeStr2Page(res, HttpStatus.BAD_REQUEST, "鏈嶅姟鍚嶄笉鑳戒负绌�");
+ if (WebHelper.isEmpty(serviceName)) {
+ return WebHelper.writeJson2Page(res, HttpStatus.BAD_REQUEST, "鏈嶅姟鍚嶄笉鑳戒负绌�");
}
return true;
@@ -113,18 +114,21 @@
return validate(serviceName, width, height, Y2000, res);
}
+ /**
+ * 楠岃瘉
+ */
private boolean validate(String serviceName, Integer width, Integer height, Long timestamp, HttpServletResponse res) {
- if (StringHelper.isEmpty(serviceName)) {
- return WebHelper.writeStr2Page(res, HttpStatus.BAD_REQUEST, "鏈嶅姟鍚嶄笉鑳戒负绌�");
+ if (WebHelper.isEmpty(serviceName)) {
+ return WebHelper.writeJson2Page(res, HttpStatus.BAD_REQUEST, "鏈嶅姟鍚嶄笉鑳戒负绌�");
}
if (null == width || width < MIN_SIZE || width > MAX_SIZE) {
- return WebHelper.writeStr2Page(res, HttpStatus.BAD_REQUEST, "鍥惧儚瀹藉害涓嶈兘涓虹┖涓斿彇鍊艰寖鍥翠负" + MIN_SIZE + "~" + MAX_SIZE + "涔嬮棿");
+ return WebHelper.writeJson2Page(res, HttpStatus.BAD_REQUEST, "鍥惧儚瀹藉害涓嶈兘涓虹┖涓斿彇鍊艰寖鍥翠负" + MIN_SIZE + "~" + MAX_SIZE + "涔嬮棿");
}
if (null == height || height < MIN_SIZE || height > MAX_SIZE) {
- return WebHelper.writeStr2Page(res, HttpStatus.BAD_REQUEST, "鍥惧儚楂樺害涓嶈兘涓虹┖涓斿彇鍊艰寖鍥翠负" + MIN_SIZE + "~" + MAX_SIZE + "涔嬮棿");
+ return WebHelper.writeJson2Page(res, HttpStatus.BAD_REQUEST, "鍥惧儚楂樺害涓嶈兘涓虹┖涓斿彇鍊艰寖鍥翠负" + MIN_SIZE + "~" + MAX_SIZE + "涔嬮棿");
}
- if (null == timestamp || timestamp < Y2000) {
- return WebHelper.writeStr2Page(res, HttpStatus.BAD_REQUEST, "鏃堕棿涓嶈兘涓虹┖涓斿ぇ浜�2000骞�");
+ if (null == timestamp || timestamp < 0) {
+ return WebHelper.writeJson2Page(res, HttpStatus.BAD_REQUEST, "鏃堕棿涓嶈兘涓虹┖涓斿ぇ浜�0");
}
return true;
--
Gitblit v1.9.3