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-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 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 5364009..754b5b0 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 @@ -69,6 +69,8 @@ @Override protected void uploadFile(MultipartFile file, FileInfo fileInfo) throws Exception { String clientID = httpServletRequest.getHeader(SecurityConstants.CLIENT_HEADER); + String hospitalID = httpServletRequest.getHeader(SecurityConstants.USER_HOSPITAL_ID_HEADER); + String depID = httpServletRequest.getHeader(SecurityConstants.USER_DEP_ID_HEADER); String folderByDate = DateUtil.formatDate(new Date()); int begin = file.getOriginalFilename().indexOf("."); int last = file.getOriginalFilename().length(); @@ -76,10 +78,10 @@ String fileName = UUID.randomUUID().toString().replaceAll("-", "") + fileType; String fileFolder = ""; if (clientID.equals("hospital")) {//医院端平台, - fileFolder = FilePath(fileInfo.getImgType(), folderByDate, null, null); + fileFolder = FilePath(fileInfo.getImgType(), folderByDate, hospitalID, depID); fileUpLoadOss(fileInfo, fileFolder + fileName, file.getInputStream()); } else { - fileFolder = FilePath(fileInfo.getImgType(), folderByDate, null, null); + fileFolder = FilePath(fileInfo.getImgType(), folderByDate, hospitalID, depID); fileUpLoadOss(fileInfo, fileFolder + fileName, file.getInputStream()); } } @@ -98,12 +100,13 @@ * @param newFilePath 上传到的文件路径 * @param fileStream 要上传的文件流 */ + @Override public void fileUpLoadOss(FileInfo fileInfo, String newFilePath, InputStream fileStream) { ossClient.putObject(fileProperties.getOss().getBucketName(), newFilePath, fileStream); fileInfo.setUrl(fileProperties.getOss().getDomain() + newFilePath); } - + @Override public OSSObject down(String url) { GetObjectRequest request = new GetObjectRequest(fileProperties.getOss().getBucketName(), url); return ossClient.getObject(request); @@ -115,6 +118,7 @@ * @param imgType * @return */ + @Override public String FilePath(String imgType, String folderByDate, String hospitalId, String departmentId) { //返回的文件路径 String fileFolder = OssPathEn+"/"; @@ -123,23 +127,18 @@ 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 + "/"; + + if (StringUtils.isNotBlank(hospitalId) && + StringUtils.isNotBlank(departmentId)) { + fileFolder += "Xray/" + hospitalId + "/" + departmentId + "/" + 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 + "/"; - } + 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)) { + if (StringUtils.isNotBlank(hospitalId) && + StringUtils.isNotBlank(departmentId)) { fileFolder += "AppXray/" + hospitalId + "/" + departmentId + "/" + folderByDate + "/"; } else { fileFolder += "AppXray/" + folderByDate + "/"; -- Gitblit v1.8.0