From 8797682a40691a2661956fc33e34e8adf14279cd Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 26 Oct 2020 10:40:45 +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 | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 492dbff..9cd6d33 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
@@ -332,7 +332,36 @@
newfileInfo.setSource("aliyun");
newfileInfo.setImgType(houzhui);
newfileInfo.setCreateTime(new Date());
- this.fileUpLoadOss(newfileInfo,OssPathEn+"pdf/"+newFileName,inputStream);
+ this.fileUpLoadOss(newfileInfo,OssPathEn.trim()+"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