fix: 123

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysExportController.java

@@ -580,8 +580,14 @@ public class SysExportController {
 		File f = ExportReport.main_bulidTemplate2(infoList, upmsConfig.getBasePath());
 		FileInputStream input = new FileInputStream(f);
 
-		MultipartFile multipartFile = new MockMultipartFile("学术推广服务任务明细(" + packageId + ")", "学术推广服务任务明细(" + packageId + ").doc", "text/plain", IOUtils.toByteArray(input));
-		return sysFileService.uploadFileAllUrlRealName(multipartFile);
+
+		String name = "学术推广服务任务明细(" + packageId + ")";
+		String suffix = ".doc";
+
+
+
+		// MultipartFile multipartFile = new MockMultipartFile("学术推广服务任务明细(" + packageId + ")", "学术推广服务任务明细(" + packageId + ").doc", "text/plain", IOUtils.toByteArray(input));
+		return sysFileService.uploadFileAllUrlRealName(name,suffix,input);
 	}
 
 	public String getFieldValueByFieldName(String fieldName, Object object) {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/SysFileService.java

@@ -23,6 +23,7 @@ import com.qunzhixinxi.hnqz.common.core.util.R;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
 import java.io.InputStream;
 
 /**
@@ -47,7 +48,9 @@ public interface SysFileService extends IService<SysFile> {
 	 */
 	R uploadFileAllUrl(MultipartFile file);
 
-	public R uploadFileAllUrlRealName(MultipartFile file) ;
+	R uploadFileAllUrlRealName(MultipartFile file) ;
+
+	R uploadFileAllUrlRealName(String fileName, String suffix, FileInputStream io);
 
 	/**
 	 * 读取文件

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysFileServiceImpl.java

@@ -37,8 +37,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -144,6 +146,35 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
 		return R.ok(resultMap);
 	}
 
+
+	/**
+	 * 上传文件
+	 * @return
+	 */
+	@Override
+	public R uploadFileAllUrlRealName(String fileName, String suffix, FileInputStream io) {
+
+		Date  date=new Date();
+		SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
+		String idStr=format.format(date);
+
+		fileName = String.format("%s-%s.%s",fileName,idStr,suffix);
+
+		Map<String, String> resultMap = new HashMap<>(4);
+		resultMap.put("bucketName", ossProperties.getBucketName());
+		resultMap.put("fileName", fileName);
+		resultMap.put("url", String.format("%s/admin/sys-file/%s/%s",upmsConfig.getClientUrl(), ossProperties.getBucketName(), fileName));
+
+		try {
+			minioTemplate.putObject(ossProperties.getBucketName(), fileName, io);
+		}
+		catch (Exception e) {
+			log.error("上传失败", e);
+			return R.failed(e.getLocalizedMessage());
+		}
+		return R.ok(resultMap);
+	}
+
 	/**
 	 * 读取文件
 	 * @param bucket