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 a998c13..60df4f3 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 @@ -9,11 +9,12 @@ import com.bonus.common.core.page.TableDataInfo; import com.bonus.common.enums.OperaType; import com.bonus.web.domain.ArchivalCatalogueDto; import com.bonus.web.domain.SelectDto; +import com.bonus.web.domain.vo.ArchivalCatalogueVo; import com.bonus.web.service.ArchiveService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -61,11 +62,11 @@ public class ArchiveController extends BaseController { } } - @ApiOperation(value = "新增档案目录") - @PostMapping("add") - @SysLog(title = "新增档案目录", module = "档案管理->档案目录管理", businessType = OperaType.INSERT, details = "新增档案目录", logType = 1) + @ApiOperation(value = "新增档案右侧目录") + @PostMapping("addRight") + @SysLog(title = "新增档案右侧目录", module = "档案管理->档案目录管理", businessType = OperaType.INSERT, details = "新增档案右侧目录", logType = 1) @RequiresPermissions("archive:catalogue:add") - public R saveArchivalCatalogue(@RequestBody ArchivalCatalogueDto dto) { + public R saveArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueDto dto) { try { if (dto.getParentId() == null) { return R.fail("父级有误"); @@ -84,6 +85,29 @@ public class ArchiveController extends BaseController { return R.fail("请求出错了"); } } + @ApiOperation(value = "新增档案左侧目录") + @PostMapping("addLeft") + @SysLog(title = "新增档案左侧目录", module = "档案管理->档案目录管理", businessType = OperaType.INSERT, details = "新增档案左侧目录", logType = 1) + @RequiresPermissions("archive:catalogue:add") + public R saveArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueVo vo) { + try { + if (vo.getParentId() == null) { + return R.fail("父级有误"); + } + if (vo.getLevel() == null) { + return R.fail("级别有误"); + } + Integer i = service.saveArchivalCatalogue(vo); + if (i > 0) { + return R.ok(); + } else { + return R.fail("新增失败"); + } + } catch (Exception e) { + log.error(e.toString(), e); + return R.fail("请求出错了"); + } + } @ApiOperation(value = "查询单个档案记录") @GetMapping("getArchivalCatalogueById") @@ -100,10 +124,10 @@ public class ArchiveController extends BaseController { } @ApiOperation(value = "修改档案目录") - @PostMapping("edit") + @PostMapping("editLeft") @SysLog(title = "修改档案目录", module = "档案管理->档案目录管理", businessType = OperaType.UPDATE, details = "修改档案目录", logType = 1) @RequiresPermissions("archive:catalogue:edit") - public R> editArchivalCatalogue(@RequestBody ArchivalCatalogueDto dto) { + public R> editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueDto dto) { try { Integer i = service.editArchivalCatalogue(dto); if (i > 0) { @@ -116,6 +140,23 @@ public class ArchiveController extends BaseController { return R.fail("请求出错了"); } } + @ApiOperation(value = "修改档案目录") + @PostMapping("editRight") + @SysLog(title = "修改档案目录", module = "档案管理->档案目录管理", businessType = OperaType.UPDATE, details = "修改档案目录", logType = 1) + @RequiresPermissions("archive:catalogue:edit") + public R> editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueVo vo) { + try { + Integer i = service.editArchivalCatalogue(vo); + if (i > 0) { + return R.ok(); + } else { + return R.fail("修改失败"); + } + } catch (Exception e) { + log.error(e.toString(), e); + return R.fail("请求出错了"); + } + } @ApiOperation(value = "删除档案目录") @PostMapping("del") diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/ArchivalCatalogueDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/ArchivalCatalogueDto.java index 8c0ad55..008b53a 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/ArchivalCatalogueDto.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/ArchivalCatalogueDto.java @@ -1,6 +1,7 @@ package com.bonus.web.domain; import lombok.Data; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -16,17 +17,26 @@ import java.util.List; public class ArchivalCatalogueDto { private Integer id; @NotBlank(message = "分类名称或文件题名不能为空") + @Length(max = 50, message = "分类名称或文件题名长度不能超过50个字符") private String contentName; private String parentName; @NotNull(message = "上级节点不能为空") private Integer parentId; private Integer level; + @NotNull(message = "分类号/案卷排序号不能为空") private Integer sort; + @NotNull(message = "档案标识代码不能为空") private String markCode; - @NotBlank(message = "请选择档案分类") + @NotBlank(message = "案卷期限不能为空") + @Length(max = 20, message = "案卷期限长度不能超过20个字符") private String term; + @NotBlank(message = "归档责任单位不能为空") + @Length(max = 20, message = "案卷期限长度不能超过20个字符") private String unitName; + @NotBlank(message = "所属专业不能为空") + @Length(max = 20, message = "案卷期限长度不能超过20个字符") private String major; + @NotBlank(message = "文件分类标记不能为空") private String classifyMark; private String createTime; private String updateTime; diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/vo/ArchivalCatalogueVo.java b/bonus-admin/src/main/java/com/bonus/web/domain/vo/ArchivalCatalogueVo.java new file mode 100644 index 0000000..a3940a4 --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/domain/vo/ArchivalCatalogueVo.java @@ -0,0 +1,42 @@ +package com.bonus.web.domain.vo; + +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author：liang.chao + * @Date：2025/9/9 - 14:18 + * 档案目录实体 + */ +@Data +public class ArchivalCatalogueVo { + private Integer id; + @NotBlank(message = "分类名称或文件题名不能为空") + @Length(max = 50, message = "分类名称或文件题名长度不能超过50个字符") + private String contentName; + private String parentName; + @NotNull(message = "上级节点不能为空") + private Integer parentId; + private Integer level; + @NotNull(message = "分类号/案卷排序号不能为空") + private Integer sort; + private String markCode; + private String term; + private String unitName; + private String major; + private String classifyMark; + private String createTime; + private String updateTime; + private String createUserId; + private String createUserName; + private String updateUserId; + private String updateUserName; + private String delFlag; + // 子节点列表（用于构建树） + private List children = new ArrayList<>(); +} 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 d632887..c18656c 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 @@ -2,6 +2,7 @@ package com.bonus.web.mapper; import com.bonus.web.domain.ArchivalCatalogueDto; import com.bonus.web.domain.SelectDto; +import com.bonus.web.domain.vo.ArchivalCatalogueVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -15,10 +16,12 @@ public interface ArchiveMapper { List getArchivalCatalogueTree(ArchivalCatalogueDto dto); Integer saveArchivalCatalogue(ArchivalCatalogueDto dto); + Integer saveArchivalCatalogue(ArchivalCatalogueVo dto); List getArchivalCatalogue(ArchivalCatalogueDto dto); Integer editArchivalCatalogue(ArchivalCatalogueDto dto); + Integer editArchivalCatalogue(ArchivalCatalogueVo dto); Integer delArchivalCatalogue(ArchivalCatalogueDto dto); 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 ea498a1..2162788 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 @@ -2,6 +2,7 @@ package com.bonus.web.service; import com.bonus.web.domain.ArchivalCatalogueDto; import com.bonus.web.domain.SelectDto; +import com.bonus.web.domain.vo.ArchivalCatalogueVo; import java.util.List; @@ -13,10 +14,12 @@ public interface ArchiveService { List getArchivalCatalogueTree(ArchivalCatalogueDto dto); Integer saveArchivalCatalogue(ArchivalCatalogueDto dto); + Integer saveArchivalCatalogue(ArchivalCatalogueVo vo); List getArchivalCatalogue(ArchivalCatalogueDto dto); Integer editArchivalCatalogue(ArchivalCatalogueDto dto); + Integer editArchivalCatalogue(ArchivalCatalogueVo dto); Integer delArchivalCatalogue(ArchivalCatalogueDto dto); 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 868206a..d063fba 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 @@ -4,6 +4,7 @@ import com.bonus.common.utils.SecurityUtils; import com.bonus.web.controller.tool.TreeBuilder; import com.bonus.web.domain.ArchivalCatalogueDto; import com.bonus.web.domain.SelectDto; +import com.bonus.web.domain.vo.ArchivalCatalogueVo; import com.bonus.web.mapper.ArchiveMapper; import com.bonus.web.service.ArchiveService; import org.springframework.stereotype.Service; @@ -36,6 +37,13 @@ public class ArchiveServiceImpl implements ArchiveService { return archiveMapper.saveArchivalCatalogue(dto); } + @Override + public Integer saveArchivalCatalogue(ArchivalCatalogueVo vo) { + vo.setCreateUserId(SecurityUtils.getLoginUser().getUserId().toString()); + vo.setCreateUserName(SecurityUtils.getLoginUser().getUsername()); + return archiveMapper.saveArchivalCatalogue(vo); + } + @Override public List getArchivalCatalogue(ArchivalCatalogueDto dto) { return archiveMapper.getArchivalCatalogue(dto); @@ -48,6 +56,13 @@ public class ArchiveServiceImpl implements ArchiveService { return archiveMapper.editArchivalCatalogue(dto); } + @Override + public Integer editArchivalCatalogue(ArchivalCatalogueVo dto) { + dto.setUpdateUserId(SecurityUtils.getLoginUser().getUserId().toString()); + dto.setUpdateUserName(SecurityUtils.getLoginUser().getUsername()); + return archiveMapper.editArchivalCatalogue(dto); + } + @Override public Integer delArchivalCatalogue(ArchivalCatalogueDto dto) { // 先判断下面是否还有节点，有的话无法删除