changes

liuhaonan

2022-09-14 c3e734b8a5370f3d4b0102a86721a98adb8e3476

 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() {