From c3e734b8a5370f3d4b0102a86721a98adb8e3476 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 14 九月 2022 15:28:38 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java
index 9d37c17..faa6ede 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java
@@ -20,7 +20,6 @@
import com.sandu.ximon.dao.mapper.PlatformFileMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.ArrayStack;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -51,7 +50,7 @@
PermissionToCheck();
FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
PlatformFile platformFile = new PlatformFile();
- platformFile.setFileName(fileUploadDto.getFileName());
+ platformFile.setFileName(fileUploadDto.getOriginName());
platformFile.setFileSize(fileUploadDto.getFileSize());
platformFile.setFileUrl(fileUploadDto.getFileUrl());
log.error("瓒呯杩涜鏂囦欢涓婁紶[ 鏂囦欢鍚�:" + fileUploadDto.getFileName() + ", 鏂囦欢澶у皬: " + fileUploadDto.getFileSize() + ", url: " + fileUploadDto.getFileUrl() + "]");
@@ -92,7 +91,13 @@
if (platformFiles == null && platformFiles.size() == 0) {
throw new BusinessException("鏈壘鍒版枃浠�!");
}
- return removeByIds(platformFiles);
+ //鍒犻櫎鍏崇郴
+ boolean remove = platformFileUserService.remove(Wrappers.lambdaQuery(PlatformFileUser.class).in(PlatformFileUser::getFileId, param.getFileIds()));
+ if (remove) {
+ //鍒犻櫎鏂囦欢
+ return removeByIds(param.getFileIds());
+ }
+ return false;
}
@@ -103,7 +108,7 @@
* @param keyword
* @return
*/
- public Object fileList(BaseConditionVO vo, String keyword) {
+ public List<PlatformFileListBo> fileList(BaseConditionVO vo, String keyword) {
List<PlatformFileListBo> platformFileListBos;
if (AdministratorEnums.ADMIN.getCode().equals(SecurityUtils.getUserDetails().getAdministratorType())) {
PageHelper.startPage(vo.getPageNo(), vo.getPageSize());
@@ -164,6 +169,7 @@
/**
* 杩斿洖鎵�鏈夌敤鎴�
+ *
* @return
*/
public List<AllUserInfoParam> allUserList() {
--
Gitblit v1.9.3