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/service/show/MarkService.java | 38 +++++---------------------------------
1 files changed, 5 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/lf/server/service/show/MarkService.java b/src/main/java/com/lf/server/service/show/MarkService.java
index 1472688..7c38ba1 100644
--- a/src/main/java/com/lf/server/service/show/MarkService.java
+++ b/src/main/java/com/lf/server/service/show/MarkService.java
@@ -85,7 +85,7 @@
return markMapper.updates(list);
}
- public void downloadShp(UserEntity ue, List<MarkJsonEntity> list, HttpServletRequest req, HttpServletResponse res) throws Exception {
+ public String downloadShp(UserEntity ue, List<MarkJsonEntity> list, HttpServletRequest req, HttpServletResponse res) throws Exception {
String parent = pathHelper.getTempPath(ue.getId());
String path = getShpDir(ue, parent);
@@ -104,13 +104,14 @@
File[] files = new File(path).listFiles();
if (files == null || files.length == 0) {
- WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.BAD_REQUEST, "Shp鏂囦欢鐢熸垚澶辫触"));
- return;
+ return "Shp鏂囦欢鐢熸垚澶辫触";
}
String zip = getZip(parent);
ZipHelper.zip(zip, parent);
- download(res, zip);
+ //download(res, zip);
+
+ return "";
}
private String getShpDir(UserEntity ue, String parent) {
@@ -149,34 +150,5 @@
return path;
}
- private void download(HttpServletResponse res, String file) throws Exception {
- String fileName = URLEncoder.encode(FileHelper.getFileName(file), "UTF-8");
- // 璁剧疆鍝嶅簲澶翠腑鏂囦欢鐨勪笅杞芥柟寮忎负闄勪欢鏂瑰紡锛屼互鍙婅缃枃浠跺悕
- res.setHeader("Content-Disposition", "attachment; filename=" + fileName);
- // 璁剧疆鍝嶅簲澶寸殑缂栫爜鏍煎紡涓篣TF-8
- res.setCharacterEncoding("UTF-8");
-
- // 閫氳繃response瀵硅薄璁剧疆鍝嶅簲鏁版嵁鏍煎紡(濡傦細"text/plain; charset=utf-8")
- String ext = FileHelper.getExtension(file);
- String mime = FileHelper.getMime(ext);
- res.setContentType(mime);
-
- // 閫氳繃response瀵硅薄锛岃幏鍙栧埌杈撳嚭娴�
- ServletOutputStream outputStream = res.getOutputStream();
- // 瀹氫箟杈撳叆娴侊紝閫氳繃杈撳叆娴佽鍙栨枃浠跺唴瀹�
- FileInputStream fileInputStream = new FileInputStream(file);
-
- int len = 0;
- byte[] bytes = new byte[1024];
- while ((len = fileInputStream.read(bytes)) != -1) {
- // 閫氳繃杈撳叆娴佽鍙栨枃浠舵暟鎹紝鐒跺悗閫氳繃涓婅堪鐨勮緭鍑烘祦鍐欏洖娴忚鍣�
- outputStream.write(bytes, 0, len);
- outputStream.flush();
- }
-
- // 鍏抽棴璧勬簮
- outputStream.close();
- fileInputStream.close();
- }
}
--
Gitblit v1.9.3