From ddae03ebb4297e78c69beab11bc8bd7e9c370913 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Wed, 24 Aug 2022 08:43:25 +0800
Subject: [PATCH] 保安公司查询修改，派遣单位字段属性修改
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 13 ++++++++-----
1 files changed, 8 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 2c30d52..8746724 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -171,10 +171,10 @@
*/
@SneakyThrows
@PostMapping("/put-file-attach")
- public R<BladeFile> putFileAttach(@RequestParam MultipartFile file,String deptid,String type) {
+ public R<BladeFile> putFileAttach(@RequestParam MultipartFile file,String deptid,String type,Long noticeId) {
String fileName = file.getOriginalFilename();
BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
- Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type);
+ Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type,noticeId);
bladeFile.setAttachId(attachId);
return R.data(bladeFile);
}
@@ -188,9 +188,9 @@
*/
@SneakyThrows
@PostMapping("/put-file-attach-by-name")
- public R<BladeFile> putFileAttach(@RequestParam String fileName, @RequestParam MultipartFile file,String deptid,String type) {
+ public R<BladeFile> putFileAttach(@RequestParam String fileName, @RequestParam MultipartFile file,String deptid,String type,Long noticeId) {
BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
- Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type);
+ Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type,noticeId);
bladeFile.setAttachId(attachId);
return R.data(bladeFile);
}
@@ -203,7 +203,7 @@
* @param bladeFile 对象存储文件
* @return attachId
*/
- private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile,String deptid,String type) {
+ private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile,String deptid,String type,Long noticeId) {
String fileExtension = FileUtil.getFileExtension(fileName);
Attach attach = new Attach();
attach.setDomain(bladeFile.getDomain());
@@ -214,6 +214,9 @@
attach.setExtension(fileExtension);
attach.setDeptid(deptid);
attach.setType(type);
+ if (null!=noticeId){
+ attach.setNoticeId(noticeId);
+ }
attachService.save(attach);
return attach.getId();
}
--
Gitblit v1.9.3