新增其他分类
This commit is contained in:
parent
277052fa5a
commit
9c53816b4c
@ -15,6 +15,7 @@ public class FileUtil {
|
|||||||
public static final int DOC_TYPE = 2;
|
public static final int DOC_TYPE = 2;
|
||||||
public static final int VIDEO_TYPE = 3;
|
public static final int VIDEO_TYPE = 3;
|
||||||
public static final int MUSIC_TYPE = 4;
|
public static final int MUSIC_TYPE = 4;
|
||||||
|
public static final int OTHER_TYPE = 5;
|
||||||
|
|
||||||
public static List<String> getFileExtendsByType(int fileType) {
|
public static List<String> getFileExtendsByType(int fileType) {
|
||||||
|
|
||||||
|
@ -22,4 +22,5 @@ public interface IFileService extends IService<FileBean> {
|
|||||||
void deleteFileByIds(List<Integer> fileIdList);
|
void deleteFileByIds(List<Integer> fileIdList);
|
||||||
void updateFilepathByFilepath(String oldfilePath, String newfilePath, String fileName, String extendName);
|
void updateFilepathByFilepath(String oldfilePath, String newfilePath, String fileName, String extendName);
|
||||||
List<FileBean> selectFileByExtendName(List<String> fileNameList, long userId);
|
List<FileBean> selectFileByExtendName(List<String> fileNameList, long userId);
|
||||||
|
List<FileBean> selectFileNotInExtendNames(List<String> fileNameList, long userId);
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.qiwenshare.file.controller;
|
package com.qiwenshare.file.controller;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.qiwenshare.common.cbb.DateUtil;
|
import com.qiwenshare.common.cbb.DateUtil;
|
||||||
import com.qiwenshare.common.cbb.RestResult;
|
import com.qiwenshare.common.cbb.RestResult;
|
||||||
import com.qiwenshare.common.operation.FileOperation;
|
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.FileBean;
|
||||||
import com.qiwenshare.file.domain.TreeNode;
|
import com.qiwenshare.file.domain.TreeNode;
|
||||||
import com.qiwenshare.file.domain.UserBean;
|
import com.qiwenshare.file.domain.UserBean;
|
||||||
|
import org.apache.commons.lang3.ArrayUtils;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.io.Serializable;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
import static com.qiwenshare.common.util.FileUtil.getFileExtendsByType;
|
import static com.qiwenshare.common.util.FileUtil.getFileExtendsByType;
|
||||||
@ -333,8 +336,19 @@ public class FileController {
|
|||||||
if (qiwenFileConfig.isShareMode()){
|
if (qiwenFileConfig.isShareMode()){
|
||||||
userId = 2;
|
userId = 2;
|
||||||
}
|
}
|
||||||
List<FileBean> file = fileService.selectFileByExtendName(getFileExtendsByType(fileBean.getFileType()), userId);
|
List<FileBean> fileList = new ArrayList<>();
|
||||||
result.setData(file);
|
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);
|
result.setSuccess(true);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.qiwenshare.file.service;
|
package com.qiwenshare.file.service;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.qiwenshare.common.cbb.DateUtil;
|
import com.qiwenshare.common.cbb.DateUtil;
|
||||||
import com.qiwenshare.common.operation.FileOperation;
|
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.FileBean;
|
||||||
import com.qiwenshare.file.domain.StorageBean;
|
import com.qiwenshare.file.domain.StorageBean;
|
||||||
import com.qiwenshare.file.domain.UserBean;
|
import com.qiwenshare.file.domain.UserBean;
|
||||||
|
import org.apache.commons.lang3.ArrayUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
@ -191,6 +194,18 @@ public class FileService extends ServiceImpl<FileMapper, FileBean> implements IF
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<FileBean> selectFileByExtendName(List<String> fileNameList, long userId) {
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user