From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

---
 src/main/java/com/lf/server/controller/data/WmtsController.java |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/data/WmtsController.java b/src/main/java/com/lf/server/controller/data/WmtsController.java
index b7df49c..4abbf2d 100644
--- a/src/main/java/com/lf/server/controller/data/WmtsController.java
+++ b/src/main/java/com/lf/server/controller/data/WmtsController.java
@@ -21,8 +21,6 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
@@ -84,9 +82,9 @@
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "浠ょ墝", required = true, dataType = "String", defaultValue = "token", paramType = "path"),
             @ApiImplicitParam(name = "layer", value = "鍥惧眰绫诲瀷", required = true, dataType = "String", defaultValue = "img"),
-            @ApiImplicitParam(name = "z", value = "灞傜骇", required = true, dataType = "Integer"),
-            @ApiImplicitParam(name = "x", value = "琛屽彿", required = true, dataType = "Integer"),
-            @ApiImplicitParam(name = "y", value = "鍒楀彿", required = true, dataType = "Integer")
+            @ApiImplicitParam(name = "tilematrix", value = "灞傜骇", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "tilerow", value = "琛屽彿", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "tilecol", value = "鍒楀彿", required = true, dataType = "Integer")
     })
     @GetMapping("select/{token}/tile")
     public void selectWmtsTile(@PathVariable(name = "token") String token, HttpServletRequest req, HttpServletResponse res) {
@@ -125,8 +123,7 @@
 
         // 璁剧疆缂撳瓨鍙傛暟
         setBrowerCache(ssRes);
-        // 璁剧疆杩斿洖鍥剧墖绫诲瀷
-        res.setContentType("image/png");
+        //res.setContentType("image/png")
 
         // 閫氳繃response瀵硅薄锛岃幏鍙栧埌杈撳嚭娴�
         ServletOutputStream outputStream = res.getOutputStream();
@@ -152,9 +149,15 @@
             outputStream.write(bytes, 0, len);
             outputStream.flush();
         }
-
-        outputStream.close();
+        //outputStream.close()
         fileInputStream.close();
+
+        // 璁剧疆杩斿洖鍥剧墖绫诲瀷
+        ssRes.getHeaders().set("Content-Type", "image/png");
+
+        OutputStream os = ssRes.getBody();
+        os.write(bytes);
+        os.flush();
     }
 
     /**

--
Gitblit v1.9.3