From e39d8049e5b928b2d1dff01a35d831e8ad3c48cd Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 17 Sep 2025 09:22:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86=E6=A0=91?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archive/FileManagementController.java | 26 +++++++++++++++++ .../bonus/web/service/FileManageService.java | 2 ++ .../service/impl/FileManageServiceImpl.java | 29 ++++++++++++------- 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileManagementController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileManagementController.java index 5700401..56fdb42 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileManagementController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileManagementController.java @@ -66,6 +66,20 @@ public class FileManagementController extends BaseController { } } + @ApiOperation(value = "档案管理树") + @GetMapping("getFileManageTreeByAddOrUpdate") + @SysLog(title = "档案管理树", module = "档案管理->档案左侧树", businessType = OperaType.QUERY, details = "档案管理树", logType = 1) + @RequiresPermissions("file:manage:tree") + public R> getFileManageTreeByAddOrUpdate(DaKyProFilesContentsDto dto) { + try { + List list = fileManageService.getFileManageTree(dto); + return R.ok(list); + } catch (Exception e) { + log.error(e.toString(), e); + return R.fail("请求出错了"); + } + } + @ApiOperation(value = "第四级档案信息") @GetMapping("getFileManage") @@ -207,4 +221,16 @@ public class FileManagementController extends BaseController { public R fileExtract(@RequestBody DaKyProFilesContentsDto dto) { return R.ok(); } + + @ApiOperation(value = "获取最大排序号") + @GetMapping("getMaxSort") + @SysLog(title = "获取最大排序号", module = "档案管理->档案目录管理", businessType = OperaType.QUERY, details = "获取最大排序号", logType = 1) + @RequiresPermissions("max:sort:query") + public R getMaxSort(DaKyProFilesContentsDto dto) { + Integer num = fileManageService.getMaxSort(dto); + if (num == null) { + num = 0; + } + return R.ok(num); + } } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/FileManageService.java b/bonus-admin/src/main/java/com/bonus/web/service/FileManageService.java index 496107a..8c327e9 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/FileManageService.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/FileManageService.java @@ -28,4 +28,6 @@ public interface FileManageService { Integer getMaxSort(DaKyProFilesContentsDto dto); Integer getSortById(Integer id); + + List getFileManageTree(DaKyProFilesContentsDto dto); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/FileManageServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/FileManageServiceImpl.java index 6e1da3f..26634ff 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/impl/FileManageServiceImpl.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/FileManageServiceImpl.java @@ -34,17 +34,6 @@ public class FileManageServiceImpl implements FileManageService { @Override public List list(DaKyProFilesContentsDto daKyProFilesContentsDto) { List list = fileManageMapper.list(daKyProFilesContentsDto); - if (daKyProFilesContentsDto.getId() != null) { - list.removeIf(dto -> "0".equals(dto.getIsUnique())); - Integer level = fileManageMapper.getLevelById(daKyProFilesContentsDto.getId()); - for (Iterator it = list.iterator(); it.hasNext(); ) { - DaKyProFilesContentsDto item = it.next(); - if (level <= item.getLevel()) { - it.remove(); - } - } - } - // 构建树 List tree = TreeBuilder.buildTreeDaKyProFilesContents(list); return tree; } @@ -134,4 +123,22 @@ public class FileManageServiceImpl implements FileManageService { public Integer getSortById(Integer id) { return fileManageMapper.getSortById(id); } + + @Override + public List getFileManageTree(DaKyProFilesContentsDto daKyProFilesContentsDto) { + List list = fileManageMapper.list(daKyProFilesContentsDto); + list.removeIf(dto -> "0".equals(dto.getIsUnique()) && dto.getLevel() != 1); + if (daKyProFilesContentsDto.getId() != null) { + Integer level = fileManageMapper.getLevelById(daKyProFilesContentsDto.getId()); + for (Iterator it = list.iterator(); it.hasNext(); ) { + DaKyProFilesContentsDto item = it.next(); + if (level <= item.getLevel()) { + it.remove(); + } + } + } + // 构建树 + List tree = TreeBuilder.buildTreeDaKyProFilesContents(list); + return tree; + } }