From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 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..c416d2f 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;
@@ -230,7 +231,7 @@
@Override
public ResultBody baseDownLoad(Map<String, Object> map) throws Exception {
String urlDiZhi=MapUtils.getString(map,"url");
- if(!urlDiZhi.contains(DOMAIN)){
+ if(!urlDiZhi.contains(DOMAIN)&&!urlDiZhi.contains(DOMAIN.replace("https","http"))){
ByteArrayOutputStream outPut = new ByteArrayOutputStream();
byte[] data = new byte[1024];
try {
@@ -259,7 +260,7 @@
List<FileInfo> fileInfos = baseMapper.selectByMap(map);
if (fileInfos.size() > 0) {
FileInfo fileInfo = fileInfos.get(0);
- OSSObject down = this.down(fileInfo.getUrl().replace(DOMAIN, ""));
+ OSSObject down = this.down(fileInfo.getUrl().replace(DOMAIN, "").replace(DOMAIN.replace("https","http"),""));
InputStream objectContent = down.getObjectContent();
//返回Base64编码过的字节数组字符串
byte[] data = null;
@@ -318,5 +319,52 @@
}
+ @Override
+ public FileInfo byteUplaod(String fileName, InputStream inputStream,int size) throws IOException {
+ 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,"pdf/"+newFileName,inputStream);
+ baseMapper.insert(newfileInfo);
+ inputStream.close();
+ return newfileInfo;
+ }
+
+ @Override
+ public FileInfo feignUploadHosIdAndDepId(MultipartFile file, String imgType, String hospitalId, String departmentId) throws Exception {
+ List<String> lassStr= Arrays.asList("png","bmp","dib","gif","jfif","jpe","jpeg","jpg","tif","tiff","ico");
+ String suffix=file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1);
+ if(!lassStr.contains(suffix)){
+ return null;
+ }
+ String name = file.getOriginalFilename();
+ String fileName= UUID.randomUUID().toString().replaceAll("-","");
+ //image/jpeg;base64
+ String newFileName=fileName+name.substring(name.lastIndexOf("."));
+ FileInfo newfileInfo=new FileInfo();
+ newfileInfo.setName(newFileName);
+ newfileInfo.setId(IdUtil.fastSimpleUUID());
+ newfileInfo.setSize(file.getSize());
+ newfileInfo.setIsImg(true);
+ newfileInfo.setContentType("image/jpeg");
+ newfileInfo.setSource("aliyun");
+ newfileInfo.setImgType(imgType);
+ newfileInfo.setCreateTime(new Date());
+ String folderByDate =DateUtil.formatDate(new Date());
+ String filePath = FilePath(imgType, folderByDate, hospitalId, departmentId);
+ InputStream inputStream = file.getInputStream();
+ this.fileUpLoadOss(newfileInfo,filePath+newFileName,inputStream);
+ inputStream.close();
+ baseMapper.insert(newfileInfo);
+ return newfileInfo;
+ }
}
--
Gitblit v1.8.0