From 803cd19fa2a3b8185fd64309d9ba4a159bed50e1 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 22 Jul 2020 15:31:10 +0800
Subject: [PATCH] 修改医生管理的添加医生部分的页面和功能
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java | 76 +++++++++++++++++++++++--------------
1 files changed, 47 insertions(+), 29 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
index 71d54eb..eb8531c 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
@@ -1,6 +1,7 @@
package com.kidgrow.filecenter.service.impl;
import cn.hutool.core.util.IdUtil;
+import com.aliyun.oss.model.OSSObject;
import com.aliyun.oss.model.ObjectMetadata;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,17 +19,13 @@
import lombok.extern.slf4j.Slf4j;
import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.collections4.MapUtils;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.multipart.MultipartFile;
import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -41,6 +38,7 @@
@Slf4j
public abstract class AbstractIFileService extends ServiceImpl<FileMapper, FileInfo> implements IFileService {
private static final String FILE_SPLIT = ".";
+ private static Logger logger = LoggerFactory.getLogger(AbstractIFileService.class);
@Override
public FileInfo upload(MultipartFile file) throws Exception {
@@ -97,6 +95,7 @@
protected abstract void uploadFile(MultipartFile file, FileInfo fileInfo) throws Exception;
protected abstract void fileUpLoadOss(FileInfo fileInfo,String newFilePath, InputStream fileStream);
protected abstract String FilePath(String imgType,String folderByDate);
+ protected abstract OSSObject down(String url);
/**
* 删除文件
@@ -135,20 +134,25 @@
@Override
public FileInfo uploadForThumbnails(MultipartFile file, String imgType) throws Exception {
FileInfo fileInfo=this.upload(file,imgType);
+ List<String> lassStr= Arrays.asList("png","bmp","dib","gif","jfif","jpe","jpeg","jpg","tif","tiff","ico");
+ String suffix=file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1);
+ if(!lassStr.contains(suffix)){
+ return null;
+ }
if (StringUtils.isNotBlank(fileInfo.getUrl())) {
//生成缩略图上传
- File nowFile= MultipartFileUtils.multipartFileToFile(file);
+// File nowFile= MultipartFileUtils.multipartFileToFile(file);
+// File nowFile= new File(file.getOriginalFilename());
//暂存目录 发布后真实存在的磁盘目录
String result = CommonConstant.TEMP_IMAGE_PATH;
//文件扩展名
- String suffix=file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
- String newFileName= RandomValueUtils.uuid()+suffix;
+ String newFileName= RandomValueUtils.uuid()+"."+suffix;
//生成缩略图
- Thumbnails.of(nowFile).size(CommonConstant.TH_IMG_WIDTH, CommonConstant.TH_IMG_HEIGHT).toFile(result+newFileName);
+ Thumbnails.of(file.getInputStream()).size(CommonConstant.TH_IMG_WIDTH, CommonConstant.TH_IMG_HEIGHT).toFile(result+newFileName);
File thuFile= new File(result+newFileName);
if (thuFile.exists()) {
//将生成的文件转换为流
- InputStream inputStream=new FileInputStream(new File(result+newFileName));
+ InputStream inputStream=new FileInputStream(thuFile);
String folderByDate = DateUtil.formatDate(new Date());
String filefloder=this.FilePath(imgType,folderByDate);
FileInfo newfileInfo=new FileInfo();
@@ -163,8 +167,10 @@
//文件上传到oss
this.fileUpLoadOss(newfileInfo,filefloder+newFileName,inputStream);
inputStream.close();
- //删除暂存文件
- MultipartFileUtils.delteTempFile(thuFile);
+// //删除暂存文件
+// MultipartFileUtils.delteTempFile(thuFile);
+ boolean delete = thuFile.delete();
+
// 将文件信息保存到数据库
baseMapper.insert(newfileInfo);
fileInfo.setPath(newfileInfo.getUrl());
@@ -214,29 +220,41 @@
}
@Override
- public ResultBody baseDownLoad(Map<String, Object> map) {
+ public ResultBody baseDownLoad(Map<String, Object> map) throws Exception {
List<FileInfo> fileInfos = baseMapper.selectByMap(map);
if(fileInfos.size()>0){
FileInfo fileInfo = fileInfos.get(0);
- InputStream in = null;
- byte[] data = null;
- //读取图片字节数组
- try{
- in = new FileInputStream(fileInfo.getUrl());
- data = new byte[in.available()];
- in.read(data);
- in.close();
- }catch (IOException e){
- e.printStackTrace();
- }
- //对字节数组Base64编码
- BASE64Encoder encoder = new BASE64Encoder();
+ OSSObject down1 = this.down(fileInfo.getUrl().replace("https://kidgrow.oss-accelerate.aliyuncs.com/",""));
+ InputStream objectContent = down1.getObjectContent();
//返回Base64编码过的字节数组字符串
- String encode = encoder.encode(data);
+ byte[] data = null;
+ // 读取图片字节数组
+ try {
+ ByteArrayOutputStream swapStream = new ByteArrayOutputStream();
+ byte[] buff = new byte[100];
+ int rc = 0;
+ while ((rc = objectContent.read(buff, 0, 100)) > 0) {
+ swapStream.write(buff, 0, rc);
+ }
+ data = swapStream.toByteArray();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ if (objectContent != null) {
+ try {
+ objectContent.close();
+ down1.close();
+ } catch (IOException e) {
+ throw new Exception("输入流关闭异常");
+ }
+ }
+ }
+ String encode="data:"+fileInfo.getContentType()+";base64,"+Base64.getEncoder().encodeToString(data);
return ResultBody.ok().data(encode);
}else {
return ResultBody.failed("获取数据失败");
}
}
+
}
--
Gitblit v1.8.0