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 13c43db6..ba652757 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 @@ -1247,6 +1247,10 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { // 新的路径名 String newDirMinioObjectKey = getFileMinioObjectKey(targetParentMetadataInfo.getObjectKey() + sourceMetadataInfo.getOriginalName()); + // 把以前归档的过同名文件删除 保留最新的 + Optional existingFileOptional = getFileMetadataInfoByObjectKey(newDirMinioObjectKey, ThreadLocalContext.getTenantId()); + existingFileOptional.ifPresent(existingFile -> fileMetadataInfoService.removeById(existingFile)); + try { minioService.copyFile(oldDirMinioObjectKey, newDirMinioObjectKey,sourceMetadataInfo.getBucketName()); // 创建目录元数据并保存到数据库 diff --git a/outbridge/src/main/java/com/sdm/outbridge/entity/LyricVUserToDm.java b/outbridge/src/main/java/com/sdm/outbridge/entity/LyricVUserToDm.java index f48fc97f..0f3c69e5 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/entity/LyricVUserToDm.java +++ b/outbridge/src/main/java/com/sdm/outbridge/entity/LyricVUserToDm.java @@ -44,6 +44,10 @@ public class LyricVUserToDm { * 工种名称 */ private String work_type_name; + /** + * 岗位编码 + */ + private String job_code; /** * 岗位名称 */ diff --git a/outbridge/src/main/java/com/sdm/outbridge/mode/GetUserListReq.java b/outbridge/src/main/java/com/sdm/outbridge/mode/GetUserListReq.java index a5ac67bd..97b3146b 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/mode/GetUserListReq.java +++ b/outbridge/src/main/java/com/sdm/outbridge/mode/GetUserListReq.java @@ -2,11 +2,19 @@ package com.sdm.outbridge.mode; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + @Data public class GetUserListReq { /** - * 工种 + * 工种 模糊匹配 */ - private String workType; + private String workType = ""; + + /** + * 工种列表 精确匹配 + */ + private List workTypeList = new ArrayList<>(); } diff --git a/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java b/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java index 2330b4ed..05321916 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java @@ -103,4 +103,10 @@ public class SimulationProjectController implements ISimulationProjectFeignClien return projectService.exportTaskTreeByScript(taskTreeExportExcelFormat, httpservletResponse); } + @GetMapping("/queryDesignVersions") + @Operation(summary = "查询项目仿真策划版本信息", description = "查询项目仿真策划版本信息") + public SdmResponse queryDesignVersions(@RequestParam("projectId") String projectId) { + return projectService.queryDesignVersions(projectId); + } + } diff --git a/project/src/main/java/com/sdm/project/service/IProjectService.java b/project/src/main/java/com/sdm/project/service/IProjectService.java index dd78bc9d..d7cbba78 100644 --- a/project/src/main/java/com/sdm/project/service/IProjectService.java +++ b/project/src/main/java/com/sdm/project/service/IProjectService.java @@ -36,4 +36,7 @@ public interface IProjectService { SdmResponse getTaskTreeList(ProjectTreeListReq req); SdmResponse exportTaskTreeByScript(TaskTreeExportExcelFormat taskTreeExportExcelFormat, HttpServletResponse httpservletResponse); + + SdmResponse queryDesignVersions(String projectId); + } diff --git a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java index 8df239fc..3f054ebe 100644 --- a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java @@ -3211,4 +3211,10 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { return taskRespond; } + @Override + public SdmResponse queryDesignVersions(String projectId) { + List versions = simulationDesignVersionsService.lambdaQuery().eq(SimulationDesignVersions::getProjectId, projectId).list(); + return SdmResponse.success(versions); + } + }