From cfb17d6e329f3cc7afe3018d6cc8784ebafd5965 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 14 九月 2022 16:08:57 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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..76dd58f 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());
@@ -141,6 +146,7 @@
* @return
*/
public String setPermission(PlatformFilePermissionParam platformFilePermissionParam) {
+ PermissionToCheck();
//鍒犻櫎鏃у叧绯�
platformFileUserService.remove(Wrappers.lambdaQuery(PlatformFileUser.class)
.eq(PlatformFileUser::getFileId, platformFilePermissionParam.getFileId()));
@@ -164,10 +170,12 @@
/**
* 杩斿洖鎵�鏈夌敤鎴�
+ *
* @return
*/
public List<AllUserInfoParam> allUserList() {
- List<Admin> adminList = adminService.list(Wrappers.lambdaQuery(Admin.class).ne(Admin::getId, 1));
+ PermissionToCheck();
+ List<Admin> adminList = adminService.list(Wrappers.lambdaQuery(Admin.class).ne(Admin::getId, SecurityUtils.getUserId()));
List<Client> clientList = clientService.list();
List<AllUserInfoParam> list = new ArrayList<>();
@@ -194,11 +202,11 @@
/**
- * 鏉冮檺鏍￠獙
+ * 鏉冮檺瓒呯鏍￠獙
*/
private void PermissionToCheck() {
if (!AdministratorEnums.ADMIN.getCode().equals(SecurityUtils.getUserDetails().getAdministratorType())) {
- //瓒呯
+ //闈炶秴绠�
throw new BusinessException("闈炶秴绠′笉鑳芥搷浣�");
}
}
--
Gitblit v1.9.3