From 1d5345f92dbd4aac2b5f68265921bb2529a71b8e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Tue, 27 Oct 2020 14:16:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
index 9d4a3e2..45c5a19 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
@@ -13,6 +13,8 @@
import javax.annotation.Resource;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
@@ -67,6 +69,15 @@
return fileService.uploadForThumbnails(file,imgType);
}
/**
+ * 文件上传 根据fileType选择上传方式 hospitalId departmentId
+ * @param file
+ * @return
+ */
+ @PostMapping(value="/feignUploadHosIdAndDepId",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ public FileInfo feignUploadHosIdAndDepId(@RequestPart("file") MultipartFile file,@RequestParam("imgType") String imgType,@RequestParam("hospitalId") String hospitalId,@RequestParam("departmentId") String departmentId) throws Exception {
+ return fileService.feignUploadHosIdAndDepId(file,imgType,hospitalId,departmentId);
+ }
+ /**
* base64上传图片
*/
@PostMapping(value="baseUplaod",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@@ -88,8 +99,8 @@
/**
* byte[]上传
*/
- @PostMapping(value="byteUplaod",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- public FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestParam("byte[]") byte[] bytes){
+ @PostMapping(value="byteUplaod")
+ public FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestBody byte[] bytes) throws IOException{
if(bytes.length == 0){
return null;
}
@@ -99,6 +110,25 @@
InputStream inputStream = new ByteArrayInputStream(bytes);
return fileService.byteUplaod(fileName,inputStream,bytes.length);
}
+ /**
+ * byte[]上传
+ */
+ @PostMapping(value="byteUplaodTest",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ public FileInfo byteUplaodTest(@RequestParam("fileName") String fileName,@RequestPart("file") MultipartFile file)throws IOException {
+ InputStream inputStream = file.getInputStream();
+ ByteArrayOutputStream bytestream = new ByteArrayOutputStream();
+ byte[] buffer=new byte[1024];
+ int ch;
+ /**
+ *
+ * */
+ while ((ch = inputStream.read(buffer)) != -1) {
+ bytestream.write(buffer,0,ch);
+ }
+ byte[] data = bytestream.toByteArray();
+ InputStream inputStream1 = new ByteArrayInputStream(data);
+ return fileService.byteUplaod(fileName,inputStream,data.length);
+ }
/**
* 文件删除
--
Gitblit v1.8.0