From ff2bba596b5b33620cc74a17c4fd7881c2315f4e Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Mon, 15 Sep 2025 16:50:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=86=E7=B1=BB=E6=A0=87?= =?UTF-8?q?=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/archive/ArchiveController.java | 27 +++++++++++++++++-- .../com/bonus/web/mapper/ArchiveMapper.java | 2 ++ .../com/bonus/web/service/ArchiveService.java | 2 ++ .../web/service/impl/ArchiveServiceImpl.java | 5 ++++ .../main/resources/mapper/ArchiveMapper.xml | 3 +++ 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchiveController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchiveController.java index 60df4f3..524a829 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchiveController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchiveController.java @@ -85,6 +85,7 @@ public class ArchiveController extends BaseController { return R.fail("请求出错了"); } } + @ApiOperation(value = "新增档案左侧目录") @PostMapping("addLeft") @SysLog(title = "新增档案左侧目录", module = "档案管理->档案目录管理", businessType = OperaType.INSERT, details = "新增档案左侧目录", logType = 1) @@ -97,6 +98,10 @@ public class ArchiveController extends BaseController { if (vo.getLevel() == null) { return R.fail("级别有误"); } + Integer num = service.geMaxSort(vo.getParentId().toString()); + if (vo.getSort() <= num) { + return R.fail("排序序号需大于" + num); + } Integer i = service.saveArchivalCatalogue(vo); if (i > 0) { return R.ok(); @@ -124,7 +129,7 @@ public class ArchiveController extends BaseController { } @ApiOperation(value = "修改档案目录") - @PostMapping("editLeft") + @PostMapping("editRight") @SysLog(title = "修改档案目录", module = "档案管理->档案目录管理", businessType = OperaType.UPDATE, details = "修改档案目录", logType = 1) @RequiresPermissions("archive:catalogue:edit") public R> editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueDto dto) { @@ -140,12 +145,17 @@ public class ArchiveController extends BaseController { return R.fail("请求出错了"); } } + @ApiOperation(value = "修改档案目录") - @PostMapping("editRight") + @PostMapping("editLeft") @SysLog(title = "修改档案目录", module = "档案管理->档案目录管理", businessType = OperaType.UPDATE, details = "修改档案目录", logType = 1) @RequiresPermissions("archive:catalogue:edit") public R> editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueVo vo) { try { + Integer num = service.geMaxSort(vo.getParentId().toString()); + if (vo.getSort() <= num) { + return R.fail("排序序号需大于" + num); + } Integer i = service.editArchivalCatalogue(vo); if (i > 0) { return R.ok(); @@ -189,4 +199,17 @@ public class ArchiveController extends BaseController { } } + @ApiOperation(value = "查询最大sort") + @GetMapping("geMaxSort") + @SysLog(title = "查询最大sort", module = "档案管理->查询最大sort", businessType = OperaType.QUERY, details = "查询最大sort", logType = 1) + public AjaxResult geMaxSort(String parentId) { + try { + Integer num = service.geMaxSort(parentId); + return AjaxResult.success(num); + } catch (Exception e) { + log.error(e.toString(), e); + return AjaxResult.error("请求出错了"); + } + } + } diff --git a/bonus-admin/src/main/java/com/bonus/web/mapper/ArchiveMapper.java b/bonus-admin/src/main/java/com/bonus/web/mapper/ArchiveMapper.java index c18656c..2e37978 100644 --- a/bonus-admin/src/main/java/com/bonus/web/mapper/ArchiveMapper.java +++ b/bonus-admin/src/main/java/com/bonus/web/mapper/ArchiveMapper.java @@ -30,4 +30,6 @@ public interface ArchiveMapper { Integer getchild(ArchivalCatalogueDto dto); List getFilesClassifyMarkSelect(ArchivalCatalogueDto dto); + + Integer geMaxSort(String parentId); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/ArchiveService.java b/bonus-admin/src/main/java/com/bonus/web/service/ArchiveService.java index 2162788..98f0046 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/ArchiveService.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/ArchiveService.java @@ -26,4 +26,6 @@ public interface ArchiveService { ArchivalCatalogueDto getArchivalCatalogueById(ArchivalCatalogueDto dto); List getFilesClassifyMarkSelect(ArchivalCatalogueDto dto); + + Integer geMaxSort(String parentId); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/ArchiveServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/ArchiveServiceImpl.java index d063fba..65dc166 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/impl/ArchiveServiceImpl.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/ArchiveServiceImpl.java @@ -82,4 +82,9 @@ public class ArchiveServiceImpl implements ArchiveService { public List getFilesClassifyMarkSelect(ArchivalCatalogueDto dto) { return archiveMapper.getFilesClassifyMarkSelect(dto); } + + @Override + public Integer geMaxSort(String parentId) { + return archiveMapper.geMaxSort(parentId); + } } diff --git a/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml b/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml index 84bdaaa..f9d3a55 100644 --- a/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml +++ b/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml @@ -163,5 +163,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE del_flag = '1' +