ak/file
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增其他分类

Browse Source
This commit is contained in:
马超 2020-11-29 13:21:03 +08:00
parent 277052fa5a
commit 9c53816b4c
4 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
file-common/src/main/java/com/qiwenshare/common/util/FileUtil.java
View File

@ -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<String> getFileExtendsByType(int fileType) {

1
file-web/src/main/java/com/qiwenshare/file/api/IFileService.java
View File

@ -22,4 +22,5 @@ public interface IFileService extends IService<FileBean> {
void deleteFileByIds(List<Integer> fileIdList);
void updateFilepathByFilepath(String oldfilePath, String newfilePath, String fileName, String extendName);
List<FileBean> selectFileByExtendName(List<String> fileNameList, long userId);
List<FileBean> selectFileNotInExtendNames(List<String> fileNameList, long userId);
}

18
file-web/src/main/java/com/qiwenshare/file/controller/FileController.java
View File

@ -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<FileBean> file = fileService.selectFileByExtendName(getFileExtendsByType(fileBean.getFileType()), userId);
result.setData(file);
List<FileBean> fileList = new ArrayList<>();
if (fileBean.getFileType() == FileUtil.OTHER_TYPE) {
List<String> 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;
}

17
file-web/src/main/java/com/qiwenshare/file/service/FileService.java
View File

@ -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<FileMapper, FileBean> implements IF
@Override
public List<FileBean> selectFileByExtendName(List<String> fileNameList, long userId) {
return fileMapper.selectFileByExtendName(fileNameList, userId);
LambdaQueryWrapper<FileBean> wrapper = new LambdaQueryWrapper<>();
wrapper.in(FileBean::getExtendName, fileNameList).eq(FileBean::getUserId, userId);
List<FileBean> fileBeans = fileMapper.selectList(wrapper);
return fileBeans;
//return fileMapper.selectFileByExtendName(fileNameList, userId);
}
@Override
public List<FileBean> selectFileNotInExtendNames(List<String> fileNameList, long userId) {
LambdaQueryWrapper<FileBean> wrapper = new LambdaQueryWrapper<>();
wrapper.notIn(FileBean::getExtendName, fileNameList).eq(FileBean::getUserId, userId);
List<FileBean> fileBeans = fileMapper.selectList(wrapper);
return fileBeans;
}
}