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 | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 2 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 7d188d4..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 @@ -2,6 +2,7 @@ import com.aliyun.oss.OSSClient; import com.aliyun.oss.common.auth.DefaultCredentialProvider; +import com.kidgrow.common.constant.SecurityConstants; import com.kidgrow.common.utils.DateUtil; import com.kidgrow.filecenter.model.FileInfo; import com.kidgrow.filecenter.properties.FileServerProperties; @@ -13,7 +14,9 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import java.util.Date; +import java.util.UUID; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> @@ -28,6 +31,8 @@ public class AliyunOSSAutoConfigure { @Autowired private FileServerProperties fileProperties; + + /** * 阿里云文件存储client @@ -46,6 +51,9 @@ @Autowired private OSSClient ossClient; + @Autowired + private HttpServletRequest httpServletRequest; + @Override protected String fileType() { return fileProperties.getType(); @@ -53,9 +61,44 @@ @Override protected void uploadFile(MultipartFile file, FileInfo fileInfo) throws Exception { + String clientID= httpServletRequest.getHeader(SecurityConstants.CLIENT_HEADER); String folderByDate =DateUtil.formatDate(new Date()); - ossClient.putObject(fileProperties.getOss().getBucketName(), fileProperties.getOss().getFolder()+ folderByDate+"/"+fileInfo.getName(), file.getInputStream()); - fileInfo.setUrl(fileProperties.getOss().getDomain() + fileProperties.getOss().getFolder()+ folderByDate+"/" + fileInfo.getName()); + 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 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); + } } @Override -- Gitblit v1.8.0