From a7b60a977aae75129a3822797278aaf2ac9d1ce9 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 17 Sep 2025 09:59:24 +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 --- .../web/domain/DaKyProFilesContentsDto.java | 2 +- .../web/domain/vo/DaKyProFilesContentsVo.java | 2 +- .../bonus/web/mapper/FileManageMapper.java | 4 ++- .../service/impl/FileManageServiceImpl.java | 22 ++++++++++----- .../resources/mapper/FileManageMapper.xml | 27 ++++++++++--------- 5 files changed, 35 insertions(+), 22 deletions(-) diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java index d1cca7b..1d612f3 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java @@ -17,7 +17,7 @@ public class DaKyProFilesContentsDto { /** * id */ - private Integer id; + private String id; /** * 项目id diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/vo/DaKyProFilesContentsVo.java b/bonus-admin/src/main/java/com/bonus/web/domain/vo/DaKyProFilesContentsVo.java index f348b71..5669628 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/vo/DaKyProFilesContentsVo.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/vo/DaKyProFilesContentsVo.java @@ -17,7 +17,7 @@ public class DaKyProFilesContentsVo { /** * id */ - private Integer id; + private String id; /** * 项目id diff --git a/bonus-admin/src/main/java/com/bonus/web/mapper/FileManageMapper.java b/bonus-admin/src/main/java/com/bonus/web/mapper/FileManageMapper.java index 0ca173e..740dc26 100644 --- a/bonus-admin/src/main/java/com/bonus/web/mapper/FileManageMapper.java +++ b/bonus-admin/src/main/java/com/bonus/web/mapper/FileManageMapper.java @@ -22,8 +22,10 @@ public interface FileManageMapper { Integer saveFileSource(DaKyProFilesContentsVo dto); Integer updateFileManage(DaKyProFilesContentsDto dto); + Integer updateFileManage(DaKyProFilesContentsVo dto); Integer updateFileSource(DaKyProFilesContentsDto dto); + Integer updateFileSource(DaKyProFilesContentsVo dto); Integer delFileSource(DaKyProFilesContentsDto dto); @@ -36,7 +38,7 @@ public interface FileManageMapper { Integer updateIntegrityStatus(DaKyProFilesContentsDto dto); - Integer getLevelById(Integer id); + Integer getLevelById(String id); Integer getMaxSort(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 26634ff..f0beddf 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 @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import java.util.Iterator; import java.util.List; +import java.util.UUID; import java.util.stream.Collectors; import static com.bonus.common.utils.SecurityUtils.getLoginUser; @@ -54,6 +55,8 @@ public class FileManageServiceImpl implements FileManageService { if (i > 0) { return R.fail("档案名称重复"); } + String uuid32 = UUID.randomUUID().toString().replace("-", "").toLowerCase(); + dto.setId(uuid32); return R.ok(fileManageMapper.saveFileManage(dto)); } @@ -78,7 +81,8 @@ public class FileManageServiceImpl implements FileManageService { } fileManageMapper.saveFileSource(dto); } - + String uuid32 = UUID.randomUUID().toString().replace("-", "").toLowerCase(); + dto.setId(uuid32); return R.ok(fileManageMapper.saveFileManage(dto)); } @@ -90,16 +94,22 @@ public class FileManageServiceImpl implements FileManageService { if (i > 0) { return R.fail("档案名称重复"); } - fileManageMapper.updateFileSource(dto); - if (StringUtils.isBlank(dto.getFilePath())) { - dto.setId(null); - } return R.ok(fileManageMapper.updateFileManage(dto)); } @Override public R updateFileManage(DaKyProFilesContentsVo dto) { - return null; + dto.setUpdateUserId(getLoginUser().getUserId()); + dto.setUpdateUserName(getLoginUser().getUsername()); + Integer i = fileManageMapper.selectFileManage(dto); + if (i > 0) { + return R.fail("档案名称重复"); + } + fileManageMapper.updateFileSource(dto); + if (StringUtils.isBlank(dto.getFilePath())) { + dto.setId(null); + } + return R.ok(fileManageMapper.updateFileManage(dto)); } @Override diff --git a/bonus-admin/src/main/resources/mapper/FileManageMapper.xml b/bonus-admin/src/main/resources/mapper/FileManageMapper.xml index 1016ed9..b6bc6ba 100644 --- a/bonus-admin/src/main/resources/mapper/FileManageMapper.xml +++ b/bonus-admin/src/main/resources/mapper/FileManageMapper.xml @@ -76,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE da_ky_pro_files_contents - id = #{id}, content_name = #{contentName}, parent_id = #{parentId}, `level` = #{level}, @@ -91,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_user_name = #{updateUserName}, update_time = now() - WHERE content_name = #{contentName} + WHERE id = #{id} and pro_id = #{proId} UPDATE da_ky_sys_file_source @@ -104,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_user_id = #{updateUserId}, update_user_name = #{updateUserName}, update_time = now() - WHERE id = #{id} + WHERE business_id = #{id} UPDATE da_ky_pro_files_contents @@ -114,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" DELETE FROM da_ky_sys_file_source - WHERE id = #{id} + WHERE business_id = #{id} DELETE FROM da_ky_pro_files_contents @@ -145,7 +144,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dkpfc.mark_code AS markCode, dkpfc.term AS term, dkpfc.unit_name AS unitName, - dkpfc.data_source AS dataSource, + case when dkpfc.data_source = '1' then '本系统上传' + when dkpfc.data_source = '2' then '智慧现场' + else '' end AS dataSource, dkpfc.is_unique AS isUnique, dkpfc.integrity_status AS integrityStatus, dkfs.id AS fileId, @@ -182,14 +183,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE dkfcns.del_flag = '1' and standard_type = '1' - +