From 03cac72a88cf303f5d62ad2b1f9b08f271dd8acf Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 2 Dec 2025 16:34:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FileManagementController.java | 22 +- .../domain/DaKyProFilesContentsDto.java | 1 + .../system/domain/RectificationDto.java | 27 +++ .../system/mapper/FileManageMapper.java | 7 + .../system/mapper/FileManageMapper.xml | 30 ++- .../system/service/FileManageService.java | 6 + .../service/impl/FileManageServiceImpl.java | 209 ++++++++++-------- 7 files changed, 203 insertions(+), 99 deletions(-) create mode 100644 blade-service/blade-system/src/main/java/org/springblade/system/domain/RectificationDto.java diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/FileManagementController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/FileManagementController.java index 44aa6f4..17e0c0b 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/FileManagementController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/FileManagementController.java @@ -21,6 +21,7 @@ import org.springblade.common.enums.OperaType; import org.springblade.common.utils.bean.FileDto; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.system.domain.DaKyProFilesContentsDto; +import org.springblade.system.domain.RectificationDto; import org.springblade.system.domain.vo.DaKyProFilesContentsVo; import org.springblade.system.mapper.FileManageMapper; import org.springblade.system.service.FileManageService; @@ -139,6 +140,23 @@ public class FileManagementController extends BaseController { public AjaxResult getFileManageById(@RequestBody DaKyProFilesContentsDto dto) { return AjaxResult.success(fileManageService.getFileManageById(dto)); } + @PostMapping("addRectification") + @SysLog(title = "加入整改清单", module = "档案管理->档案右侧列表", businessType = OperaType.QUERY, details = "加入整改清单", logType = 1) + @RequiresPermissions("file:manage:rectification") + public AjaxResult addRectification(@RequestBody @Validated RectificationDto dto) { + return fileManageService.addRectification(dto); + } + @PostMapping("selectRectificationList") + @SysLog(title = "加入整改清单", module = "档案管理->档案右侧列表", businessType = OperaType.QUERY, details = "加入整改清单", logType = 1) + @RequiresPermissions("file:manage:rectification") + public TableDataInfo selectRectificationList(@RequestBody RectificationDto dto) { + // 直接使用 dto 中的分页参数 + PageHelper.startPage(dto.getPageNum() != null ? dto.getPageNum() : 1, + dto.getPageSize() != null ? dto.getPageSize() : 10, + SqlUtil.escapeOrderBySql(dto.getOrderBy())) + .setReasonable(dto.getReasonable() != null ? dto.getReasonable() : true); + return getDataTable(fileManageService.selectRectificationList(dto)); + } @PostMapping("addFileManageRight") @SysLog(title = "新增右侧档案树", module = "档案管理->档案目录管理", businessType = OperaType.INSERT, details = "新增右侧档案树", logType = 1) @@ -347,10 +365,10 @@ public class FileManagementController extends BaseController { } /** - * 档案抽取(这里先不做，返回确认即可) + * 档案同步(这里先不做，返回确认即可) */ @PostMapping("fileExtract") - @SysLog(title = "档案抽取", module = "档案管理->档案目录管理", businessType = OperaType.DELETE, details = "档案抽取", logType = 1) + @SysLog(title = "档案同步", module = "档案管理->档案目录管理", businessType = OperaType.DELETE, details = "档案抽取", logType = 1) @RequiresPermissions("file:manage:extract") public R fileExtract(@RequestBody DaKyProFilesContentsDto dto) { return R.ok(); diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/domain/DaKyProFilesContentsDto.java b/blade-service/blade-system/src/main/java/org/springblade/system/domain/DaKyProFilesContentsDto.java index 9ff70b3..82b54da 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/domain/DaKyProFilesContentsDto.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/domain/DaKyProFilesContentsDto.java @@ -166,6 +166,7 @@ public class DaKyProFilesContentsDto extends PageDomain { private String uploadTime; private String proName; private String singleProName; + private String isRectification; private List children = new ArrayList<>(); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/domain/RectificationDto.java b/blade-service/blade-system/src/main/java/org/springblade/system/domain/RectificationDto.java new file mode 100644 index 0000000..9acba18 --- /dev/null +++ b/blade-service/blade-system/src/main/java/org/springblade/system/domain/RectificationDto.java @@ -0,0 +1,27 @@ +package org.springblade.system.domain; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springblade.common.core.page.PageDomain; + +/** + * @Author：liang.chao + * @Date：2025/12/2 - 13:41 + */ +@Data +public class RectificationDto extends PageDomain { + private String fileId; + private String proId; + @NotBlank(message = "不能为空") + @Length(max = 64, message = "整改描述不能超过64个字符") + private String description; + private String proName; + private String singleProName; + private String contentName; + private Long createUserId; + private String createTime; + private Long updateUserId; + private String updateTime; + +} diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.java index 3cda542..054e1a2 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.java @@ -2,6 +2,7 @@ package org.springblade.system.mapper; import org.springblade.system.domain.DaKyProFilesContentsDto; import org.springblade.system.domain.FilesClassifyNameStandardDto; +import org.springblade.system.domain.RectificationDto; import org.springblade.system.domain.vo.DaKyProFilesContentsVo; import java.util.List; @@ -49,4 +50,10 @@ public interface FileManageMapper { Integer getFilesNum(String proId); Integer getchild(DaKyProFilesContentsDto dto); + + Integer addRectification(RectificationDto dto); + + Integer updateisRectification(String fileId); + + List selectRectificationList(RectificationDto dto); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.xml index 4ca0f34..cb53d58 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.xml @@ -81,7 +81,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" now() - + + insert into record_rectification_list (file_id,pro_id,description,create_user_id,create_time) + values (#{fileId}, #{proId}, #{description}, #{createUserId}, now()) + + UPDATE da_ky_pro_files_contents content_name = #{contentName}, @@ -123,7 +127,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" integrity_status = '1' WHERE pro_id = #{proId} - + + UPDATE da_ky_sys_file_source + set + is_rectification = '1' + WHERE id = #{fileId} + + DELETE FROM da_ky_sys_file_source WHERE business_id = #{id} @@ -169,6 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dkpfc.is_unique AS isUnique, dkpfc.integrity_status AS integrityStatus, dkfs.id AS fileId, + dkfs.is_rectification AS isRectification, dkfs.file_name AS fileName, dkfs.create_time AS createTime, dkfs.source_file_name AS sourceFileName, @@ -276,4 +287,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE dkpfc.del_flag = '1' and dkpfc2.id = #{id} + diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/FileManageService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/FileManageService.java index 315714a..85a5355 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/FileManageService.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/FileManageService.java @@ -1,7 +1,9 @@ package org.springblade.system.service; +import org.springblade.common.core.domain.AjaxResult; import org.springblade.common.core.domain.R; import org.springblade.system.domain.DaKyProFilesContentsDto; +import org.springblade.system.domain.RectificationDto; import org.springblade.system.domain.vo.DaKyProFilesContentsVo; import java.util.List; @@ -34,4 +36,8 @@ public interface FileManageService { DaKyProFilesContentsDto getFileManageById(DaKyProFilesContentsDto dto); DaKyProFilesContentsVo getFileById(Long id); + + AjaxResult addRectification(RectificationDto dto); + + List selectRectificationList(RectificationDto dto); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/FileManageServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/FileManageServiceImpl.java index 7a8de79..9313486 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/FileManageServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/FileManageServiceImpl.java @@ -1,9 +1,11 @@ package org.springblade.system.service.impl; import jakarta.annotation.Resource; +import org.springblade.common.core.domain.AjaxResult; import org.springblade.common.core.domain.R; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.system.domain.DaKyProFilesContentsDto; +import org.springblade.system.domain.RectificationDto; import org.springblade.system.domain.vo.DaKyProFilesContentsVo; import org.springblade.system.mapper.FileManageMapper; import org.springblade.system.mapper.ProjectMapper; @@ -23,113 +25,130 @@ import java.util.UUID; */ @Service public class FileManageServiceImpl implements FileManageService { - @Resource - private FileManageMapper fileManageMapper; + @Resource + private FileManageMapper fileManageMapper; - @Resource - private ProjectMapper projectMapper; + @Resource + private ProjectMapper projectMapper; - @Override - public List list(DaKyProFilesContentsDto daKyProFilesContentsDto) { - List list = fileManageMapper.list(daKyProFilesContentsDto); - List tree = TreeBuilder.buildTreeDaKyProFilesContents(list); - return tree; - } + @Override + public List list(DaKyProFilesContentsDto daKyProFilesContentsDto) { + List list = fileManageMapper.list(daKyProFilesContentsDto); + List tree = TreeBuilder.buildTreeDaKyProFilesContents(list); + return tree; + } - @Override - public List FileManage(DaKyProFilesContentsDto dto) { - return fileManageMapper.FileManage(dto); - } + @Override + public List FileManage(DaKyProFilesContentsDto dto) { + return fileManageMapper.FileManage(dto); + } - @Override - public R saveFileManage(DaKyProFilesContentsDto dto) { - dto.setCreateUserId(AuthUtil.getUser().getUserId()); - dto.setCreateUserName(AuthUtil.getUser().getUserName()); - dto.setUpdateUserId(AuthUtil.getUser().getUserId()); - dto.setUpdateUserName(AuthUtil.getUser().getUserName()); - // 查询档案名称是否重复 - Integer i = fileManageMapper.selectFileManage(dto); - if (i > 0) { - return R.fail("档案名称重复"); - } - String uuid32 = UUID.randomUUID().toString().replace("-", "").toLowerCase(); - dto.setId(uuid32); - dto.setDataSource("1"); - dto.setIsUnique("1"); - return R.ok(fileManageMapper.saveFileManage(dto)); - } + @Override + public R saveFileManage(DaKyProFilesContentsDto dto) { + dto.setCreateUserId(AuthUtil.getUser().getUserId()); + dto.setCreateUserName(AuthUtil.getUser().getUserName()); + dto.setUpdateUserId(AuthUtil.getUser().getUserId()); + dto.setUpdateUserName(AuthUtil.getUser().getUserName()); + // 查询档案名称是否重复 + Integer i = fileManageMapper.selectFileManage(dto); + if (i > 0) { + return R.fail("档案名称重复"); + } + String uuid32 = UUID.randomUUID().toString().replace("-", "").toLowerCase(); + dto.setId(uuid32); + dto.setDataSource("1"); + dto.setIsUnique("1"); + return R.ok(fileManageMapper.saveFileManage(dto)); + } - @Override - public R saveFileManage(DaKyProFilesContentsVo dto) { - String uuid32 = UUID.randomUUID().toString().replace("-", "").toLowerCase(); - dto.setId(uuid32); - return R.ok(fileManageMapper.saveFileManage(dto)); - } + @Override + public R saveFileManage(DaKyProFilesContentsVo dto) { + String uuid32 = UUID.randomUUID().toString().replace("-", "").toLowerCase(); + dto.setId(uuid32); + return R.ok(fileManageMapper.saveFileManage(dto)); + } - @Override - public R updateFileManage(DaKyProFilesContentsDto dto) { - dto.setUpdateUserId(AuthUtil.getUser().getUserId()); - dto.setUpdateUserName(AuthUtil.getUser().getUserName()); - Integer i = fileManageMapper.selectFileManage(dto); - if (i > 0) { - return R.fail("档案名称重复"); - } - return R.ok(fileManageMapper.updateFileManage(dto)); - } + @Override + public R updateFileManage(DaKyProFilesContentsDto dto) { + dto.setUpdateUserId(AuthUtil.getUser().getUserId()); + dto.setUpdateUserName(AuthUtil.getUser().getUserName()); + Integer i = fileManageMapper.selectFileManage(dto); + if (i > 0) { + return R.fail("档案名称重复"); + } + return R.ok(fileManageMapper.updateFileManage(dto)); + } - @Override - public R updateFileManage(DaKyProFilesContentsVo dto) { - return R.ok(fileManageMapper.updateFileManage(dto)); - } + @Override + public R updateFileManage(DaKyProFilesContentsVo dto) { + return R.ok(fileManageMapper.updateFileManage(dto)); + } - @Override - public Integer delFileManage(DaKyProFilesContentsDto dto) { - fileManageMapper.delFileSource(dto); - return fileManageMapper.delFileManage(dto); - } + @Override + public Integer delFileManage(DaKyProFilesContentsDto dto) { + fileManageMapper.delFileSource(dto); + return fileManageMapper.delFileManage(dto); + } - @Override - public Integer updateIntegrityStatus(DaKyProFilesContentsDto dto) { - fileManageMapper.updateIntegrityStatus(dto); - return projectMapper.updateFileStatus(dto); - } + @Override + public Integer updateIntegrityStatus(DaKyProFilesContentsDto dto) { + fileManageMapper.updateIntegrityStatus(dto); + return projectMapper.updateFileStatus(dto); + } - @Override - public Integer getMaxSort(DaKyProFilesContentsDto dto) { - return fileManageMapper.getMaxSort(dto); - } + @Override + public Integer getMaxSort(DaKyProFilesContentsDto dto) { + return fileManageMapper.getMaxSort(dto); + } - @Override - public Integer getSortById(String id) { - return fileManageMapper.getSortById(id); - } + @Override + public Integer getSortById(String 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) { - daKyProFilesContentsDto.setParentId(daKyProFilesContentsDto.getId()); - Integer level = fileManageMapper.getLevelById(daKyProFilesContentsDto); - for (Iterator it = list.iterator(); it.hasNext(); ) { - DaKyProFilesContentsDto item = it.next(); - if (level <= item.getLevel()) { - it.remove(); - } - } - } - // 构建树 - List tree = TreeBuilder.buildTreeDaKyProFilesContents(list); - return tree; - } + @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) { + daKyProFilesContentsDto.setParentId(daKyProFilesContentsDto.getId()); + Integer level = fileManageMapper.getLevelById(daKyProFilesContentsDto); + for (Iterator it = list.iterator(); it.hasNext(); ) { + DaKyProFilesContentsDto item = it.next(); + if (level <= item.getLevel()) { + it.remove(); + } + } + } + // 构建树 + List tree = TreeBuilder.buildTreeDaKyProFilesContents(list); + return tree; + } - @Override - public DaKyProFilesContentsDto getFileManageById(DaKyProFilesContentsDto dto) { - return fileManageMapper.getFileManageById(dto); - } + @Override + public DaKyProFilesContentsDto getFileManageById(DaKyProFilesContentsDto dto) { + return fileManageMapper.getFileManageById(dto); + } - @Override - public DaKyProFilesContentsVo getFileById(Long id) { - return fileManageMapper.getFileById(id); - } + @Override + public DaKyProFilesContentsVo getFileById(Long id) { + return fileManageMapper.getFileById(id); + } + + @Override + public AjaxResult addRectification(RectificationDto dto) { + dto.setCreateUserId(AuthUtil.getUser().getUserId()); + fileManageMapper.updateisRectification(dto.getFileId()); + Integer i = fileManageMapper.addRectification(dto); + if (i > 0) { + return AjaxResult.success("添加整改成功"); + } else { + return AjaxResult.error("添加整改失败"); + } + } + + @Override + public List selectRectificationList(RectificationDto dto) { + return fileManageMapper.selectRectificationList(dto); + } }