From bdc56ebc9534620766d787a1dacb4c962ea10797 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 16 Jun 2020 10:36:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 e22afd5..aca4c2e 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
@@ -67,13 +67,30 @@
int last = file.getOriginalFilename().length();
String fileType = file.getOriginalFilename().substring(begin, last);
String fileName= UUID.randomUUID().toString().replaceAll("-","")+fileType;
- if(clientID.equals("hospital")){//医院端平台，根据医院ID，科室ID进行OSS存储
- String orgID=httpServletRequest.getHeader(SecurityConstants.USER_ORG_ID_HEADER);
- String depID=httpServletRequest.getHeader(SecurityConstants.USER_DEP_ID_HEADER);
- String fileFolder="KidgrowAI/"+orgID+"/"+depID+"/";
+ String fileFolder = "";
+ if(clientID.equals("hospital")){//医院端平台，
- ossClient.putObject(fileProperties.getOss().getBucketName(), fileFolder + folderByDate + "/" + fileName, file.getInputStream());
- fileInfo.setUrl(fileProperties.getOss().getDomain() + fileFolder + folderByDate + "/" + fileName);
+ 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 {
+ 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());
--
Gitblit v1.8.0