From ecea8849ad29ccc204d4994f6eeef5cd5064d0cc Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 14 Aug 2020 14:03:33 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 f762db3..a57b098 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
@@ -100,7 +100,7 @@
*/
protected abstract void uploadFile(MultipartFile file, FileInfo fileInfo) throws Exception;
protected abstract void fileUpLoadOss(FileInfo fileInfo,String newFilePath, InputStream fileStream);
- protected abstract String FilePath(String imgType,String folderByDate);
+ protected abstract String FilePath(String imgType,String folderByDate,String hospitalId,String departmentId);
protected abstract OSSObject down(String url);
/**
@@ -160,7 +160,7 @@
//将生成的文件转换为流
InputStream inputStream=new FileInputStream(thuFile);
String folderByDate = DateUtil.formatDate(new Date());
- String filefloder=this.FilePath(imgType,folderByDate);
+ String filefloder=this.FilePath(imgType,folderByDate,null,null);
FileInfo newfileInfo=new FileInfo();
newfileInfo.setName(newFileName);
newfileInfo.setId(IdUtil.fastSimpleUUID());
@@ -190,7 +190,7 @@
}
@Override
- public FileInfo baseUplaod(String file, String imgType) {
+ public FileInfo baseUplaod(String file, String imgType, String hospitalId, String departmentId) {
if(file==null||"".equals(file.trim())){
return null;
}
@@ -215,7 +215,9 @@
newfileInfo.setSource("aliyun");
newfileInfo.setImgType(imgType);
newfileInfo.setCreateTime(new Date());
- this.fileUpLoadOss(newfileInfo,"HospitalLogo/"+newFileName,input);
+ String folderByDate =DateUtil.formatDate(new Date());
+ String filePath = FilePath(imgType, folderByDate, hospitalId, departmentId);
+ this.fileUpLoadOss(newfileInfo,filePath,input);
input.close();
baseMapper.insert(newfileInfo);
return newfileInfo;
--
Gitblit v1.8.0