From 25f8185028c5dc6eeb391e1d596aee6ce0c80d32 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 16 七月 2024 15:29:29 +0800
Subject: [PATCH] 添加图层类

---
 src/main/java/com/se/simu/controller/WaterController.java |   15 +++++++++------
 1 files changed, 9 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 cd9e4bc..1e50750 100644
--- a/src/main/java/com/se/simu/controller/WaterController.java
+++ b/src/main/java/com/se/simu/controller/WaterController.java
@@ -1,5 +1,6 @@
 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;
@@ -49,7 +50,9 @@
                 return;
             }
 
-            //
+            LayerVo layer = waterService.getLayer(serviceName);
+
+            WebHelper.writeJson2Page(res, HttpStatus.OK, layer);
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
             WebHelper.writeStr2Page(res, HttpStatus.INTERNAL_SERVER_ERROR, ex.getMessage());
@@ -103,7 +106,7 @@
 
     private boolean validate(String serviceName, HttpServletResponse res) {
         if (StringHelper.isEmpty(serviceName)) {
-            return WebHelper.writeStr2Page(res, HttpStatus.BAD_REQUEST, "鏈嶅姟鍚嶄笉鑳戒负绌�");
+            return WebHelper.writeJson2Page(res, HttpStatus.BAD_REQUEST, "鏈嶅姟鍚嶄笉鑳戒负绌�");
         }
 
         return true;
@@ -115,16 +118,16 @@
 
     private boolean validate(String serviceName, Integer width, Integer height, Long timestamp, HttpServletResponse res) {
         if (StringHelper.isEmpty(serviceName)) {
-            return WebHelper.writeStr2Page(res, HttpStatus.BAD_REQUEST, "鏈嶅姟鍚嶄笉鑳戒负绌�");
+            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骞�");
+            return WebHelper.writeJson2Page(res, HttpStatus.BAD_REQUEST, "鏃堕棿涓嶈兘涓虹┖涓斿ぇ浜�2000骞�");
         }
 
         return true;

--
Gitblit v1.9.3