diff --git a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java index fc51560d..b85e30c7 100644 --- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java @@ -569,7 +569,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { } // 知识库 - if(dirMetadataInfo!=null&&Objects.equals(NumberConstants.ONE, dirMetadataInfo.getDirType())){ + if(dirMetadataInfo!=null&&Objects.equals(DirTypeEnum.KNOWLEDGE_BASE_DIR.getValue(), dirMetadataInfo.getDirType())){ // 发送审批电子流,成功继续西面操作,失败直接返回 // String templateId, String templateName,String approveContents,int approveAction:1:新增 2:修改 3:删除 String approveContents = getApproveContents(delFileId, "知识库文件删除", NumberConstants.THREE, deleteFileMetadataInfo, null); @@ -1013,7 +1013,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { req.getProjectId(), req.getAnalysisDirectionId(), req.getRemarks(), dirMetadataInfo.getId(), req.getFile().getSize()); // 只有知识库的文件需要审核 // 1 知识库文件夹 - boolean isknowledge = Objects.equals(NumberConstants.ONE, dirMetadataInfo.getDirType()); + boolean isknowledge = Objects.equals(DirTypeEnum.KNOWLEDGE_BASE_DIR.getValue(), dirMetadataInfo.getDirType()); if(isknowledge){ fileInfo.setApprovalStatus(ApprovalFileDataStatusEnum.PENDING.getKey()); fileInfo.setApproveType(ApproveFileDataTypeEnum.UPLOAD_REVIEWING.getCode()); @@ -1180,7 +1180,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { // 修改待审批的元数据主键id if (ObjectUtils.isEmpty(req.getFile())) { // 知识库,增加审批的逻辑,先将原始数据改成待审核状态 - if(dirMetadataInfo!=null&&Objects.equals(NumberConstants.ONE, dirMetadataInfo.getDirType())){ + if(dirMetadataInfo!=null&&Objects.equals(DirTypeEnum.KNOWLEDGE_BASE_DIR.getValue(), dirMetadataInfo.getDirType())){ FileMetadataInfo tempFileMetadataInfo = new FileMetadataInfo(); BeanUtils.copyProperties(fileMetadataInfo, tempFileMetadataInfo); // 不需要上传minio新文件,只更新文件元数据 @@ -1248,7 +1248,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { fileInfo.setFileGroupId(fileGroupId); fileInfo.setVersionNo(versionNo + 1); // 知识库修改 - if(dirMetadataInfo!=null&&Objects.equals(NumberConstants.ONE, dirMetadataInfo.getDirType())){ + if(dirMetadataInfo!=null&&Objects.equals(DirTypeEnum.KNOWLEDGE_BASE_DIR.getValue(), dirMetadataInfo.getDirType())){ // 修改了文件,增加审批相关字段 // 增加审批的逻辑,先将原始数据改成待审核状态 fileInfo.setApprovalStatus(ApprovalFileDataStatusEnum.PENDING.getKey()); @@ -1258,7 +1258,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { } fileMetadataInfoService.save(fileInfo); // 知识库创建审批流 - if(dirMetadataInfo!=null&&Objects.equals(NumberConstants.ONE, dirMetadataInfo.getDirType())){ + if(dirMetadataInfo!=null&&Objects.equals(DirTypeEnum.KNOWLEDGE_BASE_DIR.getValue(), dirMetadataInfo.getDirType())){ // 获取前后变化的file信息 String approveContents = getApproveContents(fileInfo.getId(), "知识库文件修改", NumberConstants.TWO,fileMetadataInfo , fileInfo); @@ -1292,7 +1292,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { createFilePermission(fileInfo.getId()); // 非知识库的,设置 历史版本 文件为非最新 - if(!(dirMetadataInfo!=null&&Objects.equals(NumberConstants.ONE, dirMetadataInfo.getDirType()))){ + if(!(dirMetadataInfo!=null&&Objects.equals(DirTypeEnum.KNOWLEDGE_BASE_DIR.getValue(), dirMetadataInfo.getDirType()))){ fileMetadataInfo.setIsLatest(false); fileMetadataInfoService.updateById(fileMetadataInfo); }