From 5c66931650d348cd9f7a2adb4c992ee88525201f Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Wed, 21 Aug 2024 10:01:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=88=B6=E5=93=81=E5=BA=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91):=20=E4=BA=A7=E5=93=81=E5=BA=93?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8C=85=E4=B8=8B=E8=BD=BD=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=BA=93=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 异步处理文件打包逻辑：将文件微服务打包生成的文件标识存储到产品库中 --- .../domain/PmsProductLibraryRepositories.java | 12 ++++++------ .../service/IPmsProductLibraryService.java | 2 ++ .../impl/PmsProductLibraryAsyncServiceImpl.java | 7 ++++++- .../service/impl/PmsProductLibraryServiceImpl.java | 9 +++++++-- .../pms/PmsProductLibraryRepositoriesMapper.xml | 5 +++++ 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryRepositories.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryRepositories.java index c6cda82d9..dedb519bb 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryRepositories.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryRepositories.java @@ -79,18 +79,18 @@ public class PmsProductLibraryRepositories extends BaseEntity { @ApiModelProperty(value = "其他属性(JSON字符串)") private String attributes; - /** - * 制品仓库名称 - */ + @ApiModelProperty(value = "制品仓库名称") private String alias; - /** - * 预留字段2 - */ + @ApiModelProperty(value = "快照标识") private String snapshotName; + + @ApiModelProperty(value = "打包的文件标识") + private String packagedFileIdentifier; + public RepoAttributesVo getRepoAttributes() { return JSONObject.parseObject(this.attributes, RepoAttributesVo.class); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryService.java index b350b1d5d..ed88d50fa 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryService.java @@ -80,4 +80,6 @@ public interface IPmsProductLibraryService { boolean addDockerComponentToProductRepo(DockerComponentAddToProductRepoVo dockerComponentAddToProductRepoVo); boolean packagedProduct(String enterpriseIdentifier, String productRepoName); + + int updatePmsProductLibrary(PmsProductLibraryRepositories pmsProductLibraryRepositories); } 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 4f32e0116..fe211254c 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 @@ -12,6 +12,7 @@ import com.microservices.pms.productLibrary.domain.vo.*; import com.microservices.pms.productLibrary.service.IPmsProductLibraryAsyncService; import com.microservices.pms.productLibrary.service.IPmsProductLibraryComponentService; import com.microservices.pms.productLibrary.service.IPmsProductLibraryRepositoriesService; +import com.microservices.pms.productLibrary.service.IPmsProductLibraryService; import com.microservices.pms.utils.CustomExecutorFactory; import com.microservices.pms.utils.NexusRequestHelper; import com.microservices.pms.utils.NexusRequestUrl; @@ -48,6 +49,9 @@ public class PmsProductLibraryAsyncServiceImpl implements IPmsProductLibraryAsyn @Lazy private IPmsProductLibraryRepositoriesService pmsProductLibraryRepositoriesService; @Autowired + @Lazy + private IPmsProductLibraryService pmsProductLibraryService; + @Autowired private RemoteFileService remoteFileService; @Override @@ -218,7 +222,8 @@ public class PmsProductLibraryAsyncServiceImpl implements IPmsProductLibraryAsyn productRepo.getPmsEnterpriseIdentifier() + "/productLibrary", SecurityConstants.INNER) ); - System.out.println(fileIdentifier); + productRepo.setPackagedFileIdentifier(fileIdentifier); + pmsProductLibraryService.updatePmsProductLibrary(productRepo); } finally { pmsProductLibraryRepositoriesService.unlockRepository(productRepo.getPmsEnterpriseIdentifier(), productRepo.getId()); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryServiceImpl.java index 75f87717b..d9406feb7 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryServiceImpl.java @@ -110,13 +110,18 @@ public class PmsProductLibraryServiceImpl implements IPmsProductLibraryService { // 构建更新对象 PmsProductLibraryRepositories pmsProductLibraryRepositories = productRepositoriesOperateVo.toPmsProductLibraryRepositories(); pmsProductLibraryRepositories.setId(oldRepo.getId()); - pmsProductLibraryRepositories.setUpdateTime(DateUtils.getNowDate()); - pmsProductLibraryRepositories.setUpdateBy(SecurityUtils.getUsername()); NexusHostedRepoInputVo requestBody = productRepositoriesOperateVo.toNexusRepoDataVo(); // 调用制品库更新接口更新制品库 nexusRequestHelper.doRequest(NexusRequestUrl.UPDATE_REPOSITORIES(requestBody.getType(), requestBody.getFormat(), requestBody.getName()), JSONObject.from(requestBody)); + return updatePmsProductLibrary(pmsProductLibraryRepositories); + } + + @Override + public int updatePmsProductLibrary(PmsProductLibraryRepositories pmsProductLibraryRepositories) { + pmsProductLibraryRepositories.setUpdateTime(DateUtils.getNowDate()); + pmsProductLibraryRepositories.setUpdateBy(SecurityUtils.getUsername()); return pmsProductLibraryRepositoriesMapper.updatePmsProductLibraryRepositories(pmsProductLibraryRepositories); } diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryRepositoriesMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryRepositoriesMapper.xml index 41b2f266e..b81a9bcb9 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryRepositoriesMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryRepositoriesMapper.xml @@ -21,6 +21,7 @@ + @@ -39,6 +40,7 @@ pplr.alias, pplr.snapshot_name, pplr.format, + pplr.packaged_file_identifier, pe.enterprise_identifier from pms_product_library_repositories pplr left join pms_enterprise as pe on pplr.pms_enterprise_id = pe.id @@ -164,6 +166,7 @@ attributes, alias, snapshot_name, + packaged_file_identifier, format, @@ -180,6 +183,7 @@ #{attributes}, #{alias}, #{snapshotName}, + #{packagedFileIdentifier}, #{format}, @@ -200,6 +204,7 @@ attributes = #{attributes}, alias = #{alias}, snapshot_name = #{snapshotName}, + packaged_file_identifier = #{packagedFileIdentifier}, format = #{format}, where id = #{id}