From f1918fc9554dedeee1fbfe6f5d1886440ec0b85f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 29 Jul 2021 14:41:54 +0800
Subject: [PATCH] 1.单位统计接口
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index ae158a0..3563248 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -16,9 +16,19 @@
*/
package org.springblade.modules.resource.endpoint;
+import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.springblade.common.utils.arg;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.oss.model.OssFile;
@@ -171,10 +181,10 @@
*/
@SneakyThrows
@PostMapping("/put-file-attach")
- public R<BladeFile> putFileAttach(@RequestParam MultipartFile file) {
+ public R<BladeFile> putFileAttach(@RequestParam MultipartFile file,String deptid,String type) {
String fileName = file.getOriginalFilename();
BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
- Long attachId = buildAttach(fileName, file.getSize(), bladeFile);
+ Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type);
bladeFile.setAttachId(attachId);
return R.data(bladeFile);
}
@@ -188,9 +198,9 @@
*/
@SneakyThrows
@PostMapping("/put-file-attach-by-name")
- public R<BladeFile> putFileAttach(@RequestParam String fileName, @RequestParam MultipartFile file) {
+ public R<BladeFile> putFileAttach(@RequestParam String fileName, @RequestParam MultipartFile file,String deptid,String type) {
BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
- Long attachId = buildAttach(fileName, file.getSize(), bladeFile);
+ Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type);
bladeFile.setAttachId(attachId);
return R.data(bladeFile);
}
@@ -203,7 +213,7 @@
* @param bladeFile 对象存储文件
* @return attachId
*/
- private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile) {
+ private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile,String deptid,String type) throws Exception {
String fileExtension = FileUtil.getFileExtension(fileName);
Attach attach = new Attach();
attach.setDomain(bladeFile.getDomain());
@@ -212,7 +222,10 @@
attach.setOriginalName(bladeFile.getOriginalName());
attach.setAttachSize(fileSize);
attach.setExtension(fileExtension);
+ attach.setDeptid(deptid);
+ attach.setType(type);
attachService.save(attach);
+ arg.test01(arg.url+"/blade-resource/attach/save",attach);
return attach.getId();
}
--
Gitblit v1.9.3