chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化部分功能。

This commit is contained in:
chenxudong 2025-03-25 10:06:08 +08:00
parent 3c3bc2074a
commit e004eed373
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java
View File

@ -31,4 +31,7 @@ public class FileRecycleQueryVO {
private String userName; private String userName;
private String dataOwner;
private int dataOwnCode;
} }

7
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java
View File

@ -92,9 +92,9 @@ public class FileRecycleServiceImpl implements FileRecycleService {
.or() .or()
.like(EdFileInfo::getFileCode, pars.getKeyword()) .like(EdFileInfo::getFileCode, pars.getKeyword())
.or() .or()
.like(EdFileInfo::getFileNote, pars.getKeyword()) .like(EdFileInfo::getFileNote, pars.getKeyword()));
.or() // .or()
.like(EdFileInfo::getFileContent, pars.getKeyword())); // .like(EdFileInfo::getFileContent, pars.getKeyword()));
} }
if (!UserThreadLocal.getAdminType().equals(AdminTypeEnum.SYSTEM.getValue())) { if (!UserThreadLocal.getAdminType().equals(AdminTypeEnum.SYSTEM.getValue())) {
@ -113,6 +113,7 @@ public class FileRecycleServiceImpl implements FileRecycleService {
Page<EdFileInfo> edFileInfoPage = this.edFileInfoMapper.selectPage(new Page<>(pars.getPageNum(), pars.getPageSize()), queryWrapper); Page<EdFileInfo> edFileInfoPage = this.edFileInfoMapper.selectPage(new Page<>(pars.getPageNum(), pars.getPageSize()), queryWrapper);
long total = edFileInfoPage.getTotal(); long total = edFileInfoPage.getTotal();
List<FileRecycleQueryVO> records = BeanUtil.copyToList(edFileInfoPage.getRecords(), FileRecycleQueryVO.class); List<FileRecycleQueryVO> records = BeanUtil.copyToList(edFileInfoPage.getRecords(), FileRecycleQueryVO.class);
records.forEach(e -> e.setDataOwner(DataOwnEnum.getTypeByCode(e.getDataOwnCode())));
resetRes(records); resetRes(records);
UserThreadLocal.setSuccessInfo("", "", "查询所有删除文件成功"); UserThreadLocal.setSuccessInfo("", "", "查询所有删除文件成功");
return ElectromagneticResultUtil.success(new RespPageVO<>(total, records)); return ElectromagneticResultUtil.success(new RespPageVO<>(total, records));

22
electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java
View File

@ -8,12 +8,12 @@ import java.util.Map;
@AllArgsConstructor @AllArgsConstructor
public enum DataOwnEnum { public enum DataOwnEnum {
SYS_FILE(0, "数据库上传的文件或者新建的文件夹"), SYS_FILE(0, "数据库上传的文件或者新建的文件夹", "项目数据"),
SYS_PRJ(1, "系统管理员创建的层级"), SYS_PRJ(1, "系统管理员创建的层级", "项目数据"),
USER_PRJ(2, "用户自定义的层级"), USER_PRJ(2, "用户自定义的层级", "个人数据"),
USER_FILE(4, "用户上传的文件或创建的文件夹"), USER_FILE(4, "用户上传的文件或创建的文件夹", "个人数据"),
REPO_FILE(3, "库文件"), REPO_FILE(3, "库文件", "库数据"),
REPO_PRJ(5, "库工程"); REPO_PRJ(5, "库工程", "库数据");
private static final Map<Integer, Integer> FILE_PRJ_MAP = new HashMap<>(); private static final Map<Integer, Integer> FILE_PRJ_MAP = new HashMap<>();
@ -25,6 +25,7 @@ public enum DataOwnEnum {
public final int code; public final int code;
public final String desc; public final String desc;
public final String type;
public static boolean isPrjCode(int code) { public static boolean isPrjCode(int code) {
return code == SYS_PRJ.code || code == USER_PRJ.code || code == REPO_PRJ.code; return code == SYS_PRJ.code || code == USER_PRJ.code || code == REPO_PRJ.code;
@ -49,4 +50,13 @@ public enum DataOwnEnum {
public static boolean isRepoCode(int code) { public static boolean isRepoCode(int code) {
return code == REPO_FILE.code || code == REPO_PRJ.code; return code == REPO_FILE.code || code == REPO_PRJ.code;
} }
public static String getTypeByCode(int code) {
for (DataOwnEnum e : DataOwnEnum.values()) {
if (e.code == code) {
return e.type;
}
}
return "";
}
} }