From 8cb96c927944f28e7a64a100b046c188d9182ce6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 16 七月 2024 14:38:55 +0800
Subject: [PATCH] 输出JSON至页面

---
 src/main/java/com/se/simu/helper/WebHelper.java           |   14 ++++++++++++++
 src/main/java/com/se/simu/controller/WaterController.java |   10 +++++-----
 pom.xml                                                   |    6 ++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 811dc2c..50b5602 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,12 @@
             <artifactId>fast-md5</artifactId>
             <version>2.7.1</version>
         </dependency>
+        <!--fastjson2-->
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>2.0.52</version>
+        </dependency>
         <!--gdal-->
         <dependency>
             <groupId>org.gdal</groupId>
diff --git a/src/main/java/com/se/simu/controller/WaterController.java b/src/main/java/com/se/simu/controller/WaterController.java
index cd9e4bc..a901ca1 100644
--- a/src/main/java/com/se/simu/controller/WaterController.java
+++ b/src/main/java/com/se/simu/controller/WaterController.java
@@ -103,7 +103,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 +115,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;
diff --git a/src/main/java/com/se/simu/helper/WebHelper.java b/src/main/java/com/se/simu/helper/WebHelper.java
index 650b5eb..29e6212 100644
--- a/src/main/java/com/se/simu/helper/WebHelper.java
+++ b/src/main/java/com/se/simu/helper/WebHelper.java
@@ -1,5 +1,6 @@
 package com.se.simu.helper;
 
+import com.alibaba.fastjson2.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -273,6 +274,19 @@
     }
 
     /**
+     * 杈撳嚭JSON鑷抽〉闈�
+     */
+    public static boolean writeJson2Page(HttpServletResponse res, HttpStatus status, String str) {
+        res.setStatus(status.value());
+
+        Map<String, Object> map = new HashMap(2);
+        map.put("code", status.value() >= 400 ? -1 : 0);
+        map.put("msg", str);
+
+        return writeStr2Page(res, JSON.toJSONString(map));
+    }
+
+    /**
      * 杈撳嚭str鑷抽〉闈�
      */
     public static boolean writeStr2Page(HttpServletResponse res, HttpStatus status, String str) {

--
Gitblit v1.9.3