From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/endpoint/OssEndpoint.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/endpoint/OssEndpoint.java b/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/endpoint/OssEndpoint.java
index 596e42b..c83c2a4 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/endpoint/OssEndpoint.java
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/endpoint/OssEndpoint.java
@@ -197,9 +197,9 @@
*/
@SneakyThrows
@PostMapping("/put-file-by-textualResearchAttach")
- public R putFileByPrefixTextualResearchAttach(@RequestParam MultipartFile file,String resGuid) {
+ public R putFileByPrefixTextualResearchAttach(@RequestParam MultipartFile file,String resGuid,Integer type) {
BladeFile bladeFile = ossBuilder.templateByPrefixPath("textualResearchAttach").putFile(file.getOriginalFilename(), file.getInputStream());
- buildTextualResearchAttach(resGuid,bladeFile);
+ buildTextualResearchAttach(resGuid,bladeFile,type);
return R.data(bladeFile);
}
@@ -207,9 +207,10 @@
* 保存考证附件上传数据
* @param bladeFile
*/
- private void buildTextualResearchAttach(String resGuid,BladeFile bladeFile) {
+ private void buildTextualResearchAttach(String resGuid,BladeFile bladeFile,Integer type) {
TextualResearchAttach attach = new TextualResearchAttach();
attach.setResGuid(resGuid);
+ attach.setType(type);
attach.setPath(bladeFile.getName());
attach.setName(bladeFile.getOriginalName());
attach.setCreateTime(new Date());
--
Gitblit v1.9.3