From 6ad5584f403309801c5e09cbf57714bc84d39f78 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 01 十一月 2022 10:59:59 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/show/MarkController.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/show/MarkController.java b/src/main/java/com/lf/server/controller/show/MarkController.java
index 2ff0d1f..ec1bf6e 100644
--- a/src/main/java/com/lf/server/controller/show/MarkController.java
+++ b/src/main/java/com/lf/server/controller/show/MarkController.java
@@ -228,19 +228,25 @@
     })
     @ResponseBody
     @PostMapping(value = "/downloadShp", produces = "application/json; charset=UTF-8")
-    public void downloadShp(@RequestBody List<MarkJsonEntity> list, HttpServletRequest req, HttpServletResponse res) {
+    public ResponseMsg<String> downloadShp(@RequestBody List<MarkJsonEntity> list, HttpServletRequest req, HttpServletResponse res) {
         try {
             UserEntity ue = tokenService.getCurrentUser(req);
             if (ue == null) {
-                WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.UNAUTHORIZED, "鐢ㄦ埛鏈櫥褰�"));
+                return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
             if (list == null || list.isEmpty()) {
-                WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.BAD_REQUEST, "鎵句笉鍒版爣缁樺疄浣�"));
+                return fail("鎵句笉鍒版爣缁樻暟鎹�", null);
             }
 
-            markService.downloadShp(ue, list, req, res);
+            String str = markService.downloadShp(ue, list, req, res);
+
+            return success(str);
         } catch (Exception ex) {
-            log.error(ex.getMessage(), ex);
+            return fail(ex.getMessage(), null);
         }
     }
+
+    public void downloadFile(String guid) {
+
+    }
 }

--
Gitblit v1.9.3