From daa697719eb0ddfd170f1ab94c5422a4f5b93951 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 18 Sep 2020 14:36:54 +0800
Subject: [PATCH] Merge branch 'dev'

---
 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java |   26 ++++++++++++++++++++++----
 1 files changed, 22 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 a57b098..492dbff 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
@@ -9,7 +9,6 @@
 import com.kidgrow.common.model.PageResult;
 import com.kidgrow.common.model.ResultBody;
 import com.kidgrow.common.utils.DateUtil;
-import com.kidgrow.common.utils.MultipartFileUtils;
 import com.kidgrow.common.utils.RandomValueUtils;
 import com.kidgrow.common.utils.StringUtils;
 import com.kidgrow.filecenter.mapper.FileMapper;
@@ -19,11 +18,11 @@
 import lombok.extern.slf4j.Slf4j;
 import net.coobird.thumbnailator.Thumbnails;
 import org.apache.commons.collections4.MapUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.multipart.MultipartFile;
 import sun.misc.BASE64Decoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import sun.misc.BASE64Encoder;
 
 import java.io.*;
@@ -46,6 +45,8 @@
 
     @Value("${kidgrow.file-server.oss.domain}")
     private  String DOMAIN;
+    @Value("${spring.profiles.active}")
+    private String OssPathEn;
     @Override
     public FileInfo upload(MultipartFile file) throws Exception {
         FileInfo fileInfo = FileUtil.getFileInfo(file);
@@ -217,7 +218,7 @@
             newfileInfo.setCreateTime(new Date());
             String folderByDate =DateUtil.formatDate(new Date());
             String filePath = FilePath(imgType, folderByDate, hospitalId, departmentId);
-            this.fileUpLoadOss(newfileInfo,filePath,input);
+            this.fileUpLoadOss(newfileInfo,filePath+newFileName,input);
             input.close();
             baseMapper.insert(newfileInfo);
             return newfileInfo;
@@ -318,5 +319,22 @@
 
     }
 
+    @Override
+    public FileInfo byteUplaod(String fileName, InputStream inputStream,int size) {
+        String houzhui=fileName.substring(fileName.lastIndexOf(".")+1);
+        String newFileName= RandomValueUtils.uuid()+"."+houzhui;
+        FileInfo newfileInfo=new FileInfo();
+        newfileInfo.setName(newFileName);
+        newfileInfo.setId(IdUtil.fastSimpleUUID());
+        newfileInfo.setSize(size);
+        newfileInfo.setIsImg(false);
+        newfileInfo.setContentType("byte[]");
+        newfileInfo.setSource("aliyun");
+        newfileInfo.setImgType(houzhui);
+        newfileInfo.setCreateTime(new Date());
+        this.fileUpLoadOss(newfileInfo,OssPathEn+"pdf/"+newFileName,inputStream);
+        baseMapper.insert(newfileInfo);
+        return newfileInfo;
+    }
 }
 

--
Gitblit v1.8.0