From 1b8db0473522c886428767f7eeaaf7f52d47ce42 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 20 十二月 2023 15:30:41 +0800
Subject: [PATCH] 1.盘带人级联 2.盘点物品为仓库内物品
---
consum-base/src/main/java/com/consum/base/BaseController.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/BaseController.java b/consum-base/src/main/java/com/consum/base/BaseController.java
index f41965a..468f48c 100644
--- a/consum-base/src/main/java/com/consum/base/BaseController.java
+++ b/consum-base/src/main/java/com/consum/base/BaseController.java
@@ -1,9 +1,8 @@
package com.consum.base;
+import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URLEncoder;
+import java.io.InputStream;
import javax.servlet.http.HttpServletResponse;
@@ -14,6 +13,7 @@
import com.iplatform.base.util.UserUtils;
import com.iplatform.core.BeanContextAware;
import com.iplatform.model.po.S_user_core;
+import com.walker.file.FileInfo;
public abstract class BaseController extends PlatformAdapterController {
@@ -48,18 +48,16 @@
return this.getFinSysTenantUserCache().get(String.valueOf(userInfo.getId()));
}
- protected void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) throws IOException {
- OutputStream out = response.getOutputStream();
- response.setCharacterEncoding("UTF-8");
- response.setHeader("content-Type", "application/vnd.ms-excel");
- response.setHeader("Content-Disposition",
- "attachment;filename=" + URLEncoder.encode(fileName + ".xls", "UTF-8"));
+ protected String downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) throws Exception {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
workbook.write(byteArrayOutputStream);
- response.setHeader("Content-Length", String.valueOf(byteArrayOutputStream.size()));
- out.write(byteArrayOutputStream.toByteArray());
- workbook.close();
- out.close();
+
+ InputStream byteArrayInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
+ FileInfo fileInfo = this.uploadFileToLocal(byteArrayInputStream, fileName + ".xls", "-1",
+ byteArrayOutputStream.size(), 0, "-1");
+ String fileUrl = fileInfo.getUrl();
+
+ return "/file/" + fileUrl;
}
}
--
Gitblit v1.9.1