From 8b7c75249a83b45dd53cc2177bb61bfa3d7e55cb Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 02 Mar 2021 18:30:01 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
index 818970b..06eb65d 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
@@ -33,8 +33,8 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
*
- * @Description: <br>
- * @Project: <br>
+ * @Description: AbstractIFileService 抽取类<br>
+ * @Project: 根据kidgrow.file-server.type 实例化具体对象<br>
* @CreateDate: Created in 2020/2/18 11:24 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
*/
@@ -100,7 +100,7 @@
* @param fileInfo
*/
protected abstract void uploadFile(MultipartFile file, FileInfo fileInfo) throws Exception;
- protected abstract void fileUpLoadOss(FileInfo fileInfo,String newFilePath, InputStream fileStream);
+ protected abstract void fileUpLoadOss(FileInfo fileInfo,String newFilePath, InputStream fileStream,String fileFolder);
protected abstract String FilePath(String imgType,String folderByDate,String hospitalId,String departmentId);
protected abstract OSSObject down(String url);
@@ -172,7 +172,7 @@
newfileInfo.setImgType(imgType);
newfileInfo.setCreateTime(new Date());
//文件上传到oss
- this.fileUpLoadOss(newfileInfo,filefloder+newFileName,inputStream);
+ this.fileUpLoadOss(newfileInfo,filefloder+newFileName,inputStream,filefloder);
inputStream.close();
// //删除暂存文件
// MultipartFileUtils.delteTempFile(thuFile);
@@ -218,7 +218,7 @@
newfileInfo.setCreateTime(new Date());
String folderByDate =DateUtil.formatDate(new Date());
String filePath = FilePath(imgType, folderByDate, hospitalId, departmentId);
- this.fileUpLoadOss(newfileInfo,filePath+newFileName,input);
+ this.fileUpLoadOss(newfileInfo,filePath+newFileName,input,filePath);
input.close();
baseMapper.insert(newfileInfo);
return newfileInfo;
@@ -332,7 +332,7 @@
newfileInfo.setSource("aliyun");
newfileInfo.setImgType(houzhui);
newfileInfo.setCreateTime(new Date());
- this.fileUpLoadOss(newfileInfo,"pdf/"+newFileName,inputStream);
+ this.fileUpLoadOss(newfileInfo,"pdf/"+newFileName,inputStream,"pdf/");
baseMapper.insert(newfileInfo);
inputStream.close();
return newfileInfo;
@@ -361,7 +361,7 @@
String folderByDate =DateUtil.formatDate(new Date());
String filePath = FilePath(imgType, folderByDate, hospitalId, departmentId);
InputStream inputStream = file.getInputStream();
- this.fileUpLoadOss(newfileInfo,filePath+newFileName,inputStream);
+ this.fileUpLoadOss(newfileInfo,filePath+newFileName,inputStream,filePath);
inputStream.close();
baseMapper.insert(newfileInfo);
return newfileInfo;
--
Gitblit v1.8.0