From 9c53816b4ca66b42aedc01f2b890e6d544a8009f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <1162714483@qq.com> Date: Sun, 29 Nov 2020 13:21:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=B6=E4=BB=96=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qiwenshare/common/util/FileUtil.java | 1 + .../com/qiwenshare/file/api/IFileService.java | 1 + .../file/controller/FileController.java | 18 ++++++++++++++++-- .../qiwenshare/file/service/FileService.java | 17 ++++++++++++++++- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/file-common/src/main/java/com/qiwenshare/common/util/FileUtil.java b/file-common/src/main/java/com/qiwenshare/common/util/FileUtil.java index fbf3ff8..1e09786 100644 --- a/file-common/src/main/java/com/qiwenshare/common/util/FileUtil.java +++ b/file-common/src/main/java/com/qiwenshare/common/util/FileUtil.java @@ -15,6 +15,7 @@ public class FileUtil { public static final int DOC_TYPE = 2; public static final int VIDEO_TYPE = 3; public static final int MUSIC_TYPE = 4; + public static final int OTHER_TYPE = 5; public static List getFileExtendsByType(int fileType) { diff --git a/file-web/src/main/java/com/qiwenshare/file/api/IFileService.java b/file-web/src/main/java/com/qiwenshare/file/api/IFileService.java index 6654db4..4565470 100644 --- a/file-web/src/main/java/com/qiwenshare/file/api/IFileService.java +++ b/file-web/src/main/java/com/qiwenshare/file/api/IFileService.java @@ -22,4 +22,5 @@ public interface IFileService extends IService { void deleteFileByIds(List fileIdList); void updateFilepathByFilepath(String oldfilePath, String newfilePath, String fileName, String extendName); List selectFileByExtendName(List fileNameList, long userId); + List selectFileNotInExtendNames(List fileNameList, long userId); } diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java index 58f69df..abf7772 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java @@ -1,6 +1,7 @@ package com.qiwenshare.file.controller; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qiwenshare.common.cbb.DateUtil; import com.qiwenshare.common.cbb.RestResult; import com.qiwenshare.common.operation.FileOperation; @@ -13,10 +14,12 @@ import com.qiwenshare.file.config.QiwenFileConfig; import com.qiwenshare.file.domain.FileBean; import com.qiwenshare.file.domain.TreeNode; import com.qiwenshare.file.domain.UserBean; +import org.apache.commons.lang3.ArrayUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.io.File; +import java.io.Serializable; import java.util.*; import static com.qiwenshare.common.util.FileUtil.getFileExtendsByType; @@ -333,8 +336,19 @@ public class FileController { if (qiwenFileConfig.isShareMode()){ userId = 2; } - List file = fileService.selectFileByExtendName(getFileExtendsByType(fileBean.getFileType()), userId); - result.setData(file); + List fileList = new ArrayList<>(); + if (fileBean.getFileType() == FileUtil.OTHER_TYPE) { + + List arrList = new ArrayList<>(); + arrList.addAll(Arrays.asList(FileUtil.DOC_FILE)); + arrList.addAll(Arrays.asList(FileUtil.IMG_FILE)); + arrList.addAll(Arrays.asList(FileUtil.VIDEO_FILE)); + arrList.addAll(Arrays.asList(FileUtil.MUSIC_FILE)); + fileList = fileService.selectFileNotInExtendNames(arrList, userId); + } else { + fileList = fileService.selectFileByExtendName(getFileExtendsByType(fileBean.getFileType()), userId); + } + result.setData(fileList); result.setSuccess(true); return result; } diff --git a/file-web/src/main/java/com/qiwenshare/file/service/FileService.java b/file-web/src/main/java/com/qiwenshare/file/service/FileService.java index f849829..d013084 100644 --- a/file-web/src/main/java/com/qiwenshare/file/service/FileService.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/FileService.java @@ -1,5 +1,6 @@ package com.qiwenshare.file.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qiwenshare.common.cbb.DateUtil; import com.qiwenshare.common.operation.FileOperation; @@ -13,10 +14,12 @@ import com.qiwenshare.file.mapper.FileMapper; import com.qiwenshare.file.domain.FileBean; import com.qiwenshare.file.domain.StorageBean; import com.qiwenshare.file.domain.UserBean; +import org.apache.commons.lang3.ArrayUtils; import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Arrays; import java.util.List; @@ -191,6 +194,18 @@ public class FileService extends ServiceImpl implements IF @Override public List selectFileByExtendName(List fileNameList, long userId) { - return fileMapper.selectFileByExtendName(fileNameList, userId); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(FileBean::getExtendName, fileNameList).eq(FileBean::getUserId, userId); + List fileBeans = fileMapper.selectList(wrapper); + return fileBeans; + //return fileMapper.selectFileByExtendName(fileNameList, userId); + } + + @Override + public List selectFileNotInExtendNames(List fileNameList, long userId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.notIn(FileBean::getExtendName, fileNameList).eq(FileBean::getUserId, userId); + List fileBeans = fileMapper.selectList(wrapper); + return fileBeans; } }