From 3dea48610d63edc9aa5d1af2fa7eff97d0435aec Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Wed, 12 Feb 2025 11:45:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=88=B6=E5=93=81=E5=BA=93=E4=BC=98?= =?UTF-8?q?=E5=8C=96):=20=E4=BC=98=E5=8C=96=E5=88=B6=E5=93=81=E7=A7=BB?= =?UTF-8?q?=E5=85=A5=E4=BA=A7=E5=93=81=E5=BA=93=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 制品文件下载成功后，同时将制品文件标识更新到制品assetId相同的制品中 Signed-off-by: OTTO <731554297@qq.com> --- .../mapper/PmsProductLibraryComponentMapper.java | 6 ++++-- .../service/IPmsProductLibraryComponentService.java | 2 ++ .../service/impl/PmsProductLibraryAsyncServiceImpl.java | 2 ++ .../service/impl/PmsProductLibraryComponentServiceImpl.java | 5 +++++ .../mapper/pms/PmsProductLibraryComponentMapper.xml | 5 +++++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/mapper/PmsProductLibraryComponentMapper.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/mapper/PmsProductLibraryComponentMapper.java index 70df04d82..525097fb6 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/mapper/PmsProductLibraryComponentMapper.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/mapper/PmsProductLibraryComponentMapper.java @@ -67,7 +67,7 @@ public interface PmsProductLibraryComponentMapper { * 在组织下根据制品库标识和制品文件名称查找制品文件 * * @param name 制品文件名称 - * @param repoId 制品库id + * @param repoId 制品库id * @param pmsEnterpriseId 组织Id * @return 制品文件 */ @@ -85,7 +85,7 @@ public interface PmsProductLibraryComponentMapper { * 查询对应路径下制品文件列表 * * @param path 路径 - * @param repoId 制品库id + * @param repoId 制品库id * @param pmsEnterpriseId 组织Id * @return 制品文件列表 */ @@ -115,4 +115,6 @@ public interface PmsProductLibraryComponentMapper { * @return 来自流水线的制品 */ List selectComponentListFromPipelineByAssetIdList(@Param("assetIdList") List assetIdList); + + void batchUpdateAssetFileIdentifier(@Param("assetId") String assetId, @Param("fileIdentifier") String fileIdentifier); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryComponentService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryComponentService.java index ffece4399..2fd87f85e 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryComponentService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryComponentService.java @@ -131,4 +131,6 @@ public interface IPmsProductLibraryComponentService { void unlockComponentList(Long productRepoId, List componentIdList); boolean getLockComponentStatus(Long productRepoId, String assetId); + + void batchUpdateAssetFileIdentifier(String assetId, String fileIdentifier); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryAsyncServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryAsyncServiceImpl.java index 6f6009093..78b718728 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryAsyncServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryAsyncServiceImpl.java @@ -115,6 +115,8 @@ public class PmsProductLibraryAsyncServiceImpl implements IPmsProductLibraryAsyn remoteFileService.downloadFileByUrl(nexusFileUrl, "pms", productRepo.getPmsEnterpriseIdentifier() + "/productLibrary", SecurityConstants.INNER) ); + // 制品文件下载成功后，同时将制品文件标识更新到制品assetId相同的制品中 + pmsProductLibraryComponentService.batchUpdateAssetFileIdentifier(nexusAssetResultDataVo.getId(), fileIdentifier); assetRawInputVo.setFileIdentifier(fileIdentifier); } assetRawInputVoList.add(assetRawInputVo); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryComponentServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryComponentServiceImpl.java index e27c12ec3..115bf4bc7 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryComponentServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryComponentServiceImpl.java @@ -707,6 +707,11 @@ public class PmsProductLibraryComponentServiceImpl implements IPmsProductLibrary return false; } + @Override + public void batchUpdateAssetFileIdentifier(String assetId, String fileIdentifier) { + pmsProductLibraryComponentMapper.batchUpdateAssetFileIdentifier(assetId, fileIdentifier); + } + private SysFileBytes getFeignFile(String fileIdentifier) { try { Response response = fileService.getFileEntityByIdentifier(fileIdentifier, SecurityConstants.INNER); diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryComponentMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryComponentMapper.xml index 5ff0e36ae..c15f2a255 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryComponentMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryComponentMapper.xml @@ -220,6 +220,11 @@ where id = #{id} + + update pms_product_library_component + set file_identifier = #{fileIdentifier} + where identifier = #{assetId} + delete