From 34589cd092e0de8cfd704cd59608ed0f36f6093a Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Mon, 26 Oct 2020 09:56:30 +0800
Subject: [PATCH] Merge branch 'pay_master' into dev
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 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 8458501..99da73d 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
@@ -45,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);
@@ -325,12 +327,41 @@
newfileInfo.setName(newFileName);
newfileInfo.setId(IdUtil.fastSimpleUUID());
newfileInfo.setSize(size);
- newfileInfo.setIsImg(true);
+ newfileInfo.setIsImg(false);
newfileInfo.setContentType("byte[]");
newfileInfo.setSource("aliyun");
newfileInfo.setImgType(houzhui);
newfileInfo.setCreateTime(new Date());
- this.fileUpLoadOss(newfileInfo,newFileName,inputStream);
+ this.fileUpLoadOss(newfileInfo,OssPathEn+"pdf/"+newFileName,inputStream);
+ baseMapper.insert(newfileInfo);
+ 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