From 85b973f198c326aa6db1be878d33f747e4f505fa Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 16 Jun 2020 19:02:26 +0800
Subject: [PATCH] 1.pom文件中新增汉字转拼音，生成缩略图引用 2.增加设置logo的数据修改接口 3.增加删除用户接口 4.根据用户名查看当前用户是否管理员接口 5.获取医院科室下的所有有效的医生接口 6.修改文件中心，增加支持医生文件夹。
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 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..ec404eb 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,33 @@
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 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());
--
Gitblit v1.8.0