From 2151f9f08df8e60370efdb312a1814f4a78023a6 Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Tue, 25 Aug 2020 19:49:23 +0800
Subject: [PATCH] 修改上传空的bug
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java | 124 +++++++++++++++++++++++++++++++++--------
1 files changed, 99 insertions(+), 25 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 2783c87..3029f24 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;
@@ -8,7 +9,6 @@
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.utils.DateUtil;
-import com.kidgrow.common.utils.MultipartFileUtils;
import com.kidgrow.common.utils.RandomValueUtils;
import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.filecenter.mapper.FileMapper;
@@ -18,13 +18,16 @@
import lombok.extern.slf4j.Slf4j;
import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.collections4.MapUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
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.net.HttpURLConnection;
+import java.net.URL;
import java.util.*;
/**
@@ -40,6 +43,8 @@
private static final String FILE_SPLIT = ".";
private static Logger logger = LoggerFactory.getLogger(AbstractIFileService.class);
+ @Value("${kidgrow.file-server.oss.domain}")
+ private String DOMAIN;
@Override
public FileInfo upload(MultipartFile file) throws Exception {
FileInfo fileInfo = FileUtil.getFileInfo(file);
@@ -94,7 +99,8 @@
*/
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 String FilePath(String imgType,String folderByDate,String hospitalId,String departmentId);
+ protected abstract OSSObject down(String url);
/**
* 删除文件
@@ -153,7 +159,7 @@
//将生成的文件转换为流
InputStream inputStream=new FileInputStream(thuFile);
String folderByDate = DateUtil.formatDate(new Date());
- String filefloder=this.FilePath(imgType,folderByDate);
+ String filefloder=this.FilePath(imgType,folderByDate,null,null);
FileInfo newfileInfo=new FileInfo();
newfileInfo.setName(newFileName);
newfileInfo.setId(IdUtil.fastSimpleUUID());
@@ -183,7 +189,7 @@
}
@Override
- public FileInfo baseUplaod(String file, String imgType) {
+ public FileInfo baseUplaod(String file, String imgType, String hospitalId, String departmentId) {
if(file==null||"".equals(file.trim())){
return null;
}
@@ -208,7 +214,9 @@
newfileInfo.setSource("aliyun");
newfileInfo.setImgType(imgType);
newfileInfo.setCreateTime(new Date());
- this.fileUpLoadOss(newfileInfo,"HospitalLogo/"+newFileName,input);
+ String folderByDate =DateUtil.formatDate(new Date());
+ String filePath = FilePath(imgType, folderByDate, hospitalId, departmentId);
+ this.fileUpLoadOss(newfileInfo,filePath+newFileName,input);
input.close();
baseMapper.insert(newfileInfo);
return newfileInfo;
@@ -219,29 +227,95 @@
}
@Override
- public ResultBody baseDownLoad(Map<String, Object> map) {
- 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){
+ public ResultBody baseDownLoad(Map<String, Object> map) throws Exception {
+ String urlDiZhi=MapUtils.getString(map,"url");
+ if(!urlDiZhi.contains(DOMAIN)){
+ ByteArrayOutputStream outPut = new ByteArrayOutputStream();
+ byte[] data = new byte[1024];
+ try {
+ // 创建URL
+ URL url = new URL(urlDiZhi);
+ // 创建链接
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("GET");
+ conn.setConnectTimeout(10 * 1000);
+ InputStream inStream = conn.getInputStream();
+ int len = -1;
+ while ((len = inStream.read(data)) != -1) {
+ outPut.write(data, 0, len);
+ }
+ inStream.close();
+ } catch (IOException e) {
e.printStackTrace();
}
- //对字节数组Base64编码
+ String substring = urlDiZhi.substring(urlDiZhi.lastIndexOf(".") + 1, urlDiZhi.length());
+ String str="data:image/" + substring + ";base64,";
+ // 对字节数组Base64编码
BASE64Encoder encoder = new BASE64Encoder();
- //返回Base64编码过的字节数组字符串
- String encode = encoder.encode(data);
- return ResultBody.ok().data(encode);
+ System.out.println(encoder.encode(outPut.toByteArray()));
+ return ResultBody.ok().data(str+encoder.encode(outPut.toByteArray()).replaceAll("\n", "").replaceAll("\r", ""));
}else {
- return ResultBody.failed("获取数据失败");
+ List<FileInfo> fileInfos = baseMapper.selectByMap(map);
+ if (fileInfos.size() > 0) {
+ FileInfo fileInfo = fileInfos.get(0);
+ OSSObject down = this.down(fileInfo.getUrl().replace(DOMAIN, ""));
+ InputStream objectContent = down.getObjectContent();
+ //返回Base64编码过的字节数组字符串
+ 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();
+ down.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("获取数据失败");
+ }
}
}
+
+ public static void main(String[] args) {
+
+ ByteArrayOutputStream outPut = new ByteArrayOutputStream();
+ byte[] data = new byte[1024];
+ try {
+ // 创建URL
+ URL url = new URL("http://192.168.2.25:8008/123/J-1.jpg");
+ // 创建链接
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("GET");
+ conn.setConnectTimeout(10 * 1000);
+ InputStream inStream = conn.getInputStream();
+ int len = -1;
+ while ((len = inStream.read(data)) != -1) {
+ outPut.write(data, 0, len);
+ }
+ inStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ // 对字节数组Base64编码
+ BASE64Encoder encoder = new BASE64Encoder();
+ System.out.println(encoder.encode(outPut.toByteArray()));
+
+ }
+
}
--
Gitblit v1.8.0