From 892657c0b4e376c903b5065fe97b9d199145b17b Mon Sep 17 00:00:00 2001 From: 克 刘 <4345453@qq.com> Date: Fri, 14 Aug 2020 13:23:55 +0800 Subject: [PATCH] 规范YML文件中数据库链接,采用环境配置方式,支持一个数据库创建多套环境 --- kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java | 114 ++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 80 insertions(+), 34 deletions(-) diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java index ec404eb..2b09032 100644 --- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java +++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java @@ -2,8 +2,11 @@ import com.aliyun.oss.OSSClient; import com.aliyun.oss.common.auth.DefaultCredentialProvider; +import com.aliyun.oss.model.GetObjectRequest; +import com.aliyun.oss.model.OSSObject; import com.kidgrow.common.constant.SecurityConstants; import com.kidgrow.common.utils.DateUtil; +import com.kidgrow.common.utils.StringUtils; import com.kidgrow.filecenter.model.FileInfo; import com.kidgrow.filecenter.properties.FileServerProperties; import com.kidgrow.filecenter.service.impl.AbstractIFileService; @@ -15,7 +18,10 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; +import java.io.InputStream; import java.util.Date; +import java.util.HashMap; +import java.util.Map; import java.util.UUID; /** @@ -31,7 +37,6 @@ public class AliyunOSSAutoConfigure { @Autowired private FileServerProperties fileProperties; - /** @@ -61,43 +66,18 @@ @Override protected void uploadFile(MultipartFile file, FileInfo fileInfo) throws Exception { - String clientID= httpServletRequest.getHeader(SecurityConstants.CLIENT_HEADER); - String folderByDate =DateUtil.formatDate(new Date()); + String clientID = httpServletRequest.getHeader(SecurityConstants.CLIENT_HEADER); + String folderByDate = DateUtil.formatDate(new Date()); int begin = file.getOriginalFilename().indexOf("."); int last = file.getOriginalFilename().length(); String fileType = file.getOriginalFilename().substring(begin, last); - String fileName= UUID.randomUUID().toString().replaceAll("-","")+fileType; + String fileName = UUID.randomUUID().toString().replaceAll("-", "") + fileType; String fileFolder = ""; - if(clientID.equals("hospital")){//医院端平台, - - if ((fileInfo.getImgType() != null)) { - // 光片需要按照根据医院ID,科室ID,日期进行OSS存储 - if (fileInfo.getImgType().toLowerCase().equals("xray")) { - String hospitalID = httpServletRequest.getHeader(SecurityConstants.USER_HOSPITAL_ID_HEADER); - String depID = httpServletRequest.getHeader(SecurityConstants.USER_DEP_ID_HEADER); - fileFolder = "Xray/" + hospitalID + "/" + depID + "/"+ folderByDate + "/"; - } - // 医院Logo只保存在一个目录中 - else if (fileInfo.getImgType().toLowerCase().equals("logo")) { - fileFolder = "HospitalLogo/"; - }else if (fileInfo.getImgType().toLowerCase().equals("doctor")) { - fileFolder = "DoctorImage/"; - } - else { - fileFolder = "OtherImage/"+ folderByDate + "/"; - } - - } else { - fileFolder = "OtherImage/"+ folderByDate + "/"; - } - - ossClient.putObject(fileProperties.getOss().getBucketName(), fileFolder + fileName, file.getInputStream()); - fileInfo.setUrl(fileProperties.getOss().getDomain() + fileFolder + fileName); - - } - else { - ossClient.putObject(fileProperties.getOss().getBucketName(), fileProperties.getOss().getFolder() + folderByDate + "/" + fileName, file.getInputStream()); - fileInfo.setUrl(fileProperties.getOss().getDomain() + fileProperties.getOss().getFolder() + folderByDate + "/" + fileName); + if (clientID.equals("hospital")) {//医院端平台, + fileFolder = FilePath(fileInfo.getImgType(), folderByDate, null, null); + fileUpLoadOss(fileInfo, fileFolder + fileName, file.getInputStream()); + } else { + fileUpLoadOss(fileInfo, fileProperties.getOss().getFolder() + folderByDate + "/" + fileName, file.getInputStream()); } } @@ -107,5 +87,71 @@ ossClient.deleteObject(fileProperties.getOss().getBucketName(), fileInfo.getName()); return true; } + + /** + * 给OSS上上传文件 + * + * @param fileInfo 返回对象 + * @param newFilePath 上传到的文件路径 + * @param fileStream 要上传的文件流 + */ + public void fileUpLoadOss(FileInfo fileInfo, String newFilePath, InputStream fileStream) { + ossClient.putObject(fileProperties.getOss().getBucketName(), newFilePath, fileStream); + fileInfo.setUrl(fileProperties.getOss().getDomain() + newFilePath); + + } + + public OSSObject down(String url) { + GetObjectRequest request = new GetObjectRequest(fileProperties.getOss().getBucketName(), url); + return ossClient.getObject(request); + } + + /** + * 组合sso上的文件路径 + * + * @param imgType + * @return + */ + public String FilePath(String imgType, String folderByDate, String hospitalId, String departmentId) { + //返回的文件路径 + String fileFolder = ""; + if (StringUtils.isNotBlank(imgType)) { + // 光片需要按照根据医院ID,科室ID,日期进行OSS存储 + if (imgType.toLowerCase().equals("xray")) { + String hospitalID = httpServletRequest.getHeader(SecurityConstants.USER_HOSPITAL_ID_HEADER); + String depID = httpServletRequest.getHeader(SecurityConstants.USER_DEP_ID_HEADER); + if (org.apache.commons.lang3.StringUtils.isBlank(hospitalID) && + org.apache.commons.lang3.StringUtils.isBlank(depID)) { + fileFolder = "Xray/" + hospitalID + "/" + depID + "/" + folderByDate + "/"; + } else { + if (org.apache.commons.lang3.StringUtils.isBlank(hospitalId) && + org.apache.commons.lang3.StringUtils.isBlank(departmentId)) { + fileFolder = "Xray/" + hospitalId + "/" + departmentId + "/" + folderByDate + "/"; + } else { + fileFolder = "Xray/" + folderByDate + "/"; + } + } + } else if (imgType.toLowerCase().equals("app")) { + //移动端APP上传 + if (org.apache.commons.lang3.StringUtils.isBlank(hospitalId) && + org.apache.commons.lang3.StringUtils.isBlank(departmentId)) { + fileFolder = "AppXray/" + hospitalId + "/" + departmentId + "/" + folderByDate + "/"; + } else { + fileFolder = "AppXray/" + folderByDate + "/"; + } + } + // 医院Logo只保存在一个目录中 + else if (imgType.toLowerCase().equals("logo")) { + fileFolder = "HospitalLogo/"; + } else if (imgType.toLowerCase().equals("doctor")) { + fileFolder = "DoctorImage/"; + } else { + fileFolder = "OtherImage/" + folderByDate + "/"; + } + } else { + fileFolder = "OtherImage/" + folderByDate + "/"; + } + return fileFolder; + } } } -- Gitblit v1.8.0