diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java index d1504f7..17ada5f 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java @@ -31,4 +31,7 @@ public class FileRecycleQueryVO { private String userName; + private String dataOwner; + + private int dataOwnCode; } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java index 47c4201..b429285 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java @@ -92,9 +92,9 @@ public class FileRecycleServiceImpl implements FileRecycleService { .or() .like(EdFileInfo::getFileCode, pars.getKeyword()) .or() - .like(EdFileInfo::getFileNote, pars.getKeyword()) - .or() - .like(EdFileInfo::getFileContent, pars.getKeyword())); + .like(EdFileInfo::getFileNote, pars.getKeyword())); +// .or() +// .like(EdFileInfo::getFileContent, pars.getKeyword())); } if (!UserThreadLocal.getAdminType().equals(AdminTypeEnum.SYSTEM.getValue())) { @@ -113,6 +113,7 @@ public class FileRecycleServiceImpl implements FileRecycleService { Page edFileInfoPage = this.edFileInfoMapper.selectPage(new Page<>(pars.getPageNum(), pars.getPageSize()), queryWrapper); long total = edFileInfoPage.getTotal(); List records = BeanUtil.copyToList(edFileInfoPage.getRecords(), FileRecycleQueryVO.class); + records.forEach(e -> e.setDataOwner(DataOwnEnum.getTypeByCode(e.getDataOwnCode()))); resetRes(records); UserThreadLocal.setSuccessInfo("", "", "查询所有删除文件成功"); return ElectromagneticResultUtil.success(new RespPageVO<>(total, records)); diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java index f32abba..5050d35 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java @@ -8,12 +8,12 @@ import java.util.Map; @AllArgsConstructor public enum DataOwnEnum { - SYS_FILE(0, "数据库上传的文件或者新建的文件夹"), - SYS_PRJ(1, "系统管理员创建的层级"), - USER_PRJ(2, "用户自定义的层级"), - USER_FILE(4, "用户上传的文件或创建的文件夹"), - REPO_FILE(3, "库文件"), - REPO_PRJ(5, "库工程"); + SYS_FILE(0, "数据库上传的文件或者新建的文件夹", "项目数据"), + SYS_PRJ(1, "系统管理员创建的层级", "项目数据"), + USER_PRJ(2, "用户自定义的层级", "个人数据"), + USER_FILE(4, "用户上传的文件或创建的文件夹", "个人数据"), + REPO_FILE(3, "库文件", "库数据"), + REPO_PRJ(5, "库工程", "库数据"); private static final Map FILE_PRJ_MAP = new HashMap<>(); @@ -25,6 +25,7 @@ public enum DataOwnEnum { public final int code; public final String desc; + public final String type; public static boolean isPrjCode(int 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) { 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 ""; + } } \ No newline at end of file