Compare commits
No commits in common. "26168a0821435b9d419dd387c6d6a9e57df73360" and "b17404393e9dd87d54e2093467ab4e1beea8623f" have entirely different histories.
26168a0821
...
b17404393e
|
|
@ -36,7 +36,7 @@ public class EdFileInfoController {
|
|||
return edFileInfoService.delete(id);
|
||||
}
|
||||
|
||||
@RequestMapping("getFileInfoList")
|
||||
@RequestMapping("info")
|
||||
public ElectromagneticResult<?> info(@RequestBody FileInfoQueryDTO fileInfoQueryDTO) {
|
||||
return edFileInfoService.queryEdFileInfo(fileInfoQueryDTO);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,31 +26,15 @@ public class FileInfoQueryDTO {
|
|||
private String keyword;
|
||||
|
||||
/**
|
||||
* 文件名排序 （0-升序，1-降序）
|
||||
* 文件类型 （0-文件夹 1-文件）
|
||||
*/
|
||||
private Integer fileNameSort;
|
||||
|
||||
/**
|
||||
* 文件类型 （0-升序，1-降序）
|
||||
*/
|
||||
private Integer fileTypeSort;
|
||||
|
||||
/**
|
||||
* 文件类型过滤
|
||||
*/
|
||||
private String fileType;
|
||||
private Integer dataType;
|
||||
|
||||
/**
|
||||
* 上传时间（0-升序，1-降序）
|
||||
*/
|
||||
private Integer createdTime;
|
||||
|
||||
/**
|
||||
* 修改时间（0-升序，1-降序）
|
||||
*/
|
||||
private Integer updatedTime;
|
||||
|
||||
|
||||
/**
|
||||
* 版本号（0-升序，1-降序
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
package com.electromagnetic.industry.software.manage.pojo.resp;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.FieldNameConstants;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@FieldNameConstants
|
||||
@Data
|
||||
public class FileProjectVO {
|
||||
private String categoryId;
|
||||
private String categoryName;
|
||||
private String parentId;
|
||||
private Integer dataStatus;
|
||||
|
||||
private List<FileProjectVO> children;
|
||||
}
|
||||
|
|
@ -15,4 +15,5 @@ public class ProjectVO {
|
|||
private Integer dataStatus;
|
||||
|
||||
private List<ProjectVO> children = new ArrayList<>();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.electromagnetic.industry.software.common.cons.ElectromagneticConstants;
|
||||
import com.electromagnetic.industry.software.common.enums.*;
|
||||
import com.electromagnetic.industry.software.common.exception.BizException;
|
||||
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
|
||||
|
|
@ -96,12 +97,12 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
|
|||
.eq(EdFileInfo::getParentId, fileInfoQueryDTO.getParentId())
|
||||
.like(StrUtil.isNotEmpty(fileInfoQueryDTO.getKeyword()), EdFileInfo::getFileName, fileInfoQueryDTO.getKeyword())
|
||||
.like(StrUtil.isNotEmpty(fileInfoQueryDTO.getKeyword()), EdFileInfo::getFileNote, fileInfoQueryDTO.getKeyword())
|
||||
|
||||
.eq(Objects.equals(fileInfoQueryDTO.getDataType(), EleDataTypeEnum.FOLDER.code), EdFileInfo::getFileType, EleDataTypeEnum.FOLDER.code)
|
||||
.eq(Objects.equals(fileInfoQueryDTO.getDataType(), EleDataTypeEnum.FILE.code), EdFileInfo::getFileType, EleDataTypeEnum.FILE.code)
|
||||
|
||||
.eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), EleDataStatusEnum.NOT_PUBLISHED.code), EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code)
|
||||
.eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), EleDataStatusEnum.PUBLISHED.code), EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code)
|
||||
.eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), EleDataStatusEnum.OCCUPY.code), EdFileInfo::getDataStatus, EleDataStatusEnum.OCCUPY.code)
|
||||
.eq(StrUtil.isNotEmpty(fileInfoQueryDTO.getFileType()), EdFileInfo::getFileType, fileInfoQueryDTO.getFileType())
|
||||
|
||||
.orderByAsc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 0), EdFileInfo::getCreatedTime)
|
||||
.orderByDesc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 1), EdFileInfo::getCreatedTime)
|
||||
|
|
@ -112,15 +113,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
|
|||
.orderByAsc(Objects.equals(fileInfoQueryDTO.getFileSize(), 0), EdFileInfo::getFileSize)
|
||||
.orderByDesc(Objects.equals(fileInfoQueryDTO.getFileSize(), 1), EdFileInfo::getFileSize)
|
||||
|
||||
.orderByAsc(Objects.equals(fileInfoQueryDTO.getFileNameSort(), 0), EdFileInfo::getFileName)
|
||||
.orderByDesc(Objects.equals(fileInfoQueryDTO.getFileNameSort(), 1), EdFileInfo::getFileName)
|
||||
|
||||
.orderByAsc(Objects.equals(fileInfoQueryDTO.getUpdatedTime(), 0), EdFileInfo::getUpdatedTime)
|
||||
.orderByDesc(Objects.equals(fileInfoQueryDTO.getUpdatedTime(), 1), EdFileInfo::getUpdatedTime)
|
||||
|
||||
.orderByAsc(Objects.equals(fileInfoQueryDTO.getFileTypeSort(), 0), EdFileInfo::getFileType)
|
||||
.orderByDesc(Objects.equals(fileInfoQueryDTO.getFileTypeSort(), 1), EdFileInfo::getFileType)
|
||||
|
||||
.orderByAsc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 0), EdFileInfo::getCreatedTime)
|
||||
.orderByDesc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 1), EdFileInfo::getCreatedTime);
|
||||
Page<EdFileInfo> edFileInfoPage = this.baseMapper.selectPage(new Page<>(fileInfoQueryDTO.getPageNum(), fileInfoQueryDTO.getPageSize()), queryWrapper);
|
||||
|
|
@ -165,12 +157,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
|
|||
*/
|
||||
@Override
|
||||
public ElectromagneticResult<?> tree() {
|
||||
// List<ProjectVO> projectVOS = commonService.queryAllPrjInfo(false);
|
||||
// List<FileProjectVO> res = new ArrayList<>();
|
||||
// for (ProjectVO projectVO : projectVOS) {
|
||||
//
|
||||
// }
|
||||
return ElectromagneticResultUtil.success(commonService.queryAllPrjInfo(false));
|
||||
return commonService.queryAllPrjInfo(false);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
|
|||
*/
|
||||
@Override
|
||||
public ElectromagneticResult<?> queryAllPrjInfo() {
|
||||
return ElectromagneticResultUtil.success(commonService.queryAllPrjInfo(true));
|
||||
return commonService.queryAllPrjInfo(true);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue