From 0337fc34a8948d9cf83bbbb5d71b001228b18f3a Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Tue, 30 Jul 2024 10:32:08 +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=AE=8C=E5=96=84):=20=E5=8F=97=E6=8E=A7=E5=BA=93?= =?UTF-8?q?=E5=92=8C=E4=BA=A7=E5=93=81=E5=BA=93=20=E5=9D=87=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=20=E5=90=8D=E7=A7=B0=E5=92=8C=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 受控库限制名称不能重复 --- .../PmsProductLibraryComponentController.java | 2 +- .../PmsProductLibraryController.java | 2 +- ...sProductLibraryRepositoriesController.java | 2 +- .../PmsProductLibrarySnapshotController.java | 2 +- .../domain/PmsProductLibraryComponent.java | 8 ++++---- .../domain/PmsProductLibraryRepositories.java | 14 +++++++------- .../domain/vo/GroupRepositoriesOperateVo.java | 2 +- .../vo/HostedRepositoriesOperateVo.java | 2 +- .../vo/ProductRepositoriesOperateVo.java | 2 +- .../ProductRepositoriesSnapshotInputVo.java | 2 +- .../PmsProductLibraryRepositoriesMapper.java | 16 ++++++++-------- .../IPmsProductLibraryComponentService.java | 10 +++++----- .../IPmsProductLibraryProductRepoService.java | 4 ++-- ...IPmsProductLibraryRepositoriesService.java | 2 +- ...PmsProductLibraryComponentServiceImpl.java | 2 +- ...sProductLibraryProductRepoServiceImpl.java | 2 +- ...ProductLibraryRepositoriesServiceImpl.java | 19 ++++++++++++++----- .../PmsProductLibraryRepositoriesMapper.xml | 6 ++---- 18 files changed, 53 insertions(+), 46 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryComponentController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryComponentController.java index e2cf40263..198f66ace 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryComponentController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryComponentController.java @@ -24,7 +24,7 @@ import java.util.List; @Api(tags = "制品库-制品相关接口") @RequestMapping("/{enterpriseIdentifier}/pmsProductLibraryComponent") @ApiImplicitParams({ - @ApiImplicitParam(name = "enterpriseIdentifier", value = "企业标识", paramType = "path", dataType = "String") + @ApiImplicitParam(name = "enterpriseIdentifier", value = "组织标识", paramType = "path", dataType = "String") }) public class PmsProductLibraryComponentController extends BaseController { @Autowired diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryController.java index 549fac927..30a9b39a3 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryController.java @@ -27,7 +27,7 @@ import java.util.List; @Api(tags = "产品库-相关接口") @RequestMapping("/{enterpriseIdentifier}/pmsProductLibrary") @ApiImplicitParams({ - @ApiImplicitParam(name = "enterpriseIdentifier", value = "企业标识", paramType = "path", dataType = "String") + @ApiImplicitParam(name = "enterpriseIdentifier", value = "组织标识", paramType = "path", dataType = "String") }) public class PmsProductLibraryController extends BaseController { @Autowired diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryRepositoriesController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryRepositoriesController.java index d4a8f791f..f37ff1c84 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryRepositoriesController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryRepositoriesController.java @@ -25,7 +25,7 @@ import java.util.List; @Api(tags = "制品库-仓库相关接口") @RequestMapping("/{enterpriseIdentifier}/pmsProductLibraryRepositories") @ApiImplicitParams({ - @ApiImplicitParam(name = "enterpriseIdentifier", value = "企业标识", paramType = "path", dataType = "String") + @ApiImplicitParam(name = "enterpriseIdentifier", value = "组织标识", paramType = "path", dataType = "String") }) public class PmsProductLibraryRepositoriesController extends BaseController { @Autowired diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibrarySnapshotController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibrarySnapshotController.java index 5db85edf0..a7805784d 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibrarySnapshotController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibrarySnapshotController.java @@ -26,7 +26,7 @@ import java.util.List; @Api(tags = "快照库-相关接口") @RequestMapping("/{enterpriseIdentifier}/pmsProductLibrarySnapshot") @ApiImplicitParams({ - @ApiImplicitParam(name = "enterpriseIdentifier", value = "企业标识", paramType = "path", dataType = "String") + @ApiImplicitParam(name = "enterpriseIdentifier", value = "组织标识", paramType = "path", dataType = "String") }) public class PmsProductLibrarySnapshotController extends BaseController { @Autowired diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryComponent.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryComponent.java index b5a4c773d..77cb3f403 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryComponent.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryComponent.java @@ -81,15 +81,15 @@ public class PmsProductLibraryComponent extends BaseEntity { private Long deptId; /** - * 关联企业ID + * 关联组织ID */ - @ApiModelProperty(value = "关联企业ID") + @ApiModelProperty(value = "关联组织ID") private Long pmsEnterpriseId; /** - * 关联企业ID + * 关联组织ID */ - @ApiModelProperty(value = "关联企业标识", hidden = true) + @ApiModelProperty(value = "关联组织标识", hidden = true) private String pmsEnterpriseIdentifier; /** 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 822e9942c..2ef642731 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 @@ -59,15 +59,15 @@ public class PmsProductLibraryRepositories extends BaseEntity { private Long deptId; /** - * 关联企业ID + * 关联组织ID */ - @ApiModelProperty(value = "关联企业标识", hidden = true) + @ApiModelProperty(value = "关联组织标识", hidden = true) private String pmsEnterpriseIdentifier; /** - * 关联企业ID + * 关联组织ID */ - @ApiModelProperty(value = "关联企业ID") + @ApiModelProperty(value = "关联组织ID") private Long pmsEnterpriseId; /** @@ -108,7 +108,7 @@ public class PmsProductLibraryRepositories extends BaseEntity { } /** - * 在Nexus上创建的产品库标识应该为用户输入的product+制品库标识+企业标识 + * 在Nexus上创建的产品库标识应该为用户输入的product+制品库标识+组织标识 * * @return Nexus产品库标识 */ @@ -117,7 +117,7 @@ public class PmsProductLibraryRepositories extends BaseEntity { } /** - * 在Nexus上创建的快照库标识应该为用户输入的snapshot+企业标识+制品库标识+快照库标识 + * 在Nexus上创建的快照库标识应该为用户输入的snapshot+组织标识+制品库标识+快照库标识 * * @return Nexus快照库标识 */ @@ -126,7 +126,7 @@ public class PmsProductLibraryRepositories extends BaseEntity { } /** - * 在Nexus上创建的制品库标识应该为用户输入的制品库标识+企业标识 + * 在Nexus上创建的制品库标识应该为用户输入的制品库标识+组织标识 * * @return Nexus制品库标识 */ diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/GroupRepositoriesOperateVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/GroupRepositoriesOperateVo.java index bf3aa3595..50d16530a 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/GroupRepositoriesOperateVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/GroupRepositoriesOperateVo.java @@ -26,7 +26,7 @@ public class GroupRepositoriesOperateVo { private String name; @ApiModelProperty(value = "虚拟仓库名称") private String alias; - @ApiModelProperty(value = "企业标识", hidden = true) + @ApiModelProperty(value = "组织标识", hidden = true) private String enterpriseIdentifier; @ApiModelProperty(value = "制品库类型", hidden = true) private String type = ProductLibraryRepositoriesTypeEnum.GROUP.getKey(); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/HostedRepositoriesOperateVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/HostedRepositoriesOperateVo.java index 7f76e6f29..b43e1eaff 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/HostedRepositoriesOperateVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/HostedRepositoriesOperateVo.java @@ -25,7 +25,7 @@ public class HostedRepositoriesOperateVo { private String alias; @ApiModelProperty(value = "制品库标识", hidden = true) private String name; - @ApiModelProperty(value = "企业标识", hidden = true) + @ApiModelProperty(value = "组织标识", hidden = true) private String enterpriseIdentifier; @ApiModelProperty(value = "制品库类型", hidden = true) private String type = ProductLibraryRepositoriesTypeEnum.HOSTED.getKey(); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesOperateVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesOperateVo.java index 723a33c25..88045a961 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesOperateVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesOperateVo.java @@ -24,7 +24,7 @@ public class ProductRepositoriesOperateVo { private String alias; @ApiModelProperty(value = "产品库标识", hidden = true) private String name; - @ApiModelProperty(value = "企业标识", hidden = true) + @ApiModelProperty(value = "组织标识", hidden = true) private String enterpriseIdentifier; @ApiModelProperty(value = "制品库类型", hidden = true) private String type = ProductLibraryRepositoriesTypeEnum.HOSTED.getKey(); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesSnapshotInputVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesSnapshotInputVo.java index 42e1703db..d6edfdd05 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesSnapshotInputVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesSnapshotInputVo.java @@ -26,7 +26,7 @@ public class ProductRepositoriesSnapshotInputVo { private String alias; @ApiModelProperty(value = "制品库标识", hidden = true) private String repoName; - @ApiModelProperty(value = "关联企业标识", hidden = true) + @ApiModelProperty(value = "关联组织标识", hidden = true) private String enterpriseIdentifier; public NexusHostedRepoInputVo toNexusRepoDataVo(PmsProductLibraryRepositories repo) { diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/mapper/PmsProductLibraryRepositoriesMapper.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/mapper/PmsProductLibraryRepositoriesMapper.java index e58ab7e56..5df1006d2 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/mapper/PmsProductLibraryRepositoriesMapper.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/mapper/PmsProductLibraryRepositoriesMapper.java @@ -66,7 +66,7 @@ public interface PmsProductLibraryRepositoriesMapper { * 根据名称查找制品库 * * @param name 制品库标识 - * @param pmsEnterpriseIdentifier 企业标识 + * @param pmsEnterpriseIdentifier 组织标识 * @param format 制品格式 * @return 制品库数量 */ @@ -77,7 +77,7 @@ public interface PmsProductLibraryRepositoriesMapper { * * @param repoName 制品库标识 * @param snapshotName 快照库标识 - * @param pmsEnterpriseIdentifier 企业标识 + * @param pmsEnterpriseIdentifier 组织标识 * @return 快照库数量 */ Integer selectRepositoriesSnapshotBySnapshotNameCount(@Param("pmsEnterpriseIdentifier") String pmsEnterpriseIdentifier, @Param("repoName") String repoName, @Param("snapshotName") String snapshotName); @@ -86,16 +86,16 @@ public interface PmsProductLibraryRepositoriesMapper { * 根据制品库别名查找制品库 * * @param alias 制品库别名 - * @param pmsEnterpriseIdentifier 企业标识 + * @param pmsEnterpriseIdentifier 组织标识 * @param format 制品格式 * @return 制品库数量 */ - Integer selectPmsProductLibraryRepositoriesByAliasCount(@Param("alias") String alias, @Param("pmsEnterpriseIdentifier") String pmsEnterpriseIdentifier, @Param("format") String format); + PmsProductLibraryRepositories selectPmsProductLibraryRepositoriesByAlias(@Param("alias") String alias, @Param("pmsEnterpriseIdentifier") String pmsEnterpriseIdentifier, @Param("format") String format); /** * 根据制品库标识查找制品库 * - * @param pmsEnterpriseIdentifier 企业标识 + * @param pmsEnterpriseIdentifier 组织标识 * @param name 制品库标识 * @return 制品库 */ @@ -104,7 +104,7 @@ public interface PmsProductLibraryRepositoriesMapper { /** * 根据产品库标识查找产品库 * - * @param pmsEnterpriseIdentifier 企业标识 + * @param pmsEnterpriseIdentifier 组织标识 * @param name 产品库标识 * @return 产品库 */ @@ -113,7 +113,7 @@ public interface PmsProductLibraryRepositoriesMapper { /** * 根据制品库标识以及快照库标识查找快照库 * - * @param pmsEnterpriseIdentifier 企业标识 + * @param pmsEnterpriseIdentifier 组织标识 * @param repoName 制品库标识 * @param snapshotName 快照库标识 * @return 快照库 @@ -122,7 +122,7 @@ public interface PmsProductLibraryRepositoriesMapper { /** * 查询产品库列表 * - * @param pmsEnterpriseIdentifier 企业标识 + * @param pmsEnterpriseIdentifier 组织标识 * @param name 产品库标识 * @return 产品库列表 */ 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 3446e5a97..596019d2a 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 @@ -24,7 +24,7 @@ public interface IPmsProductLibraryComponentService { /** * 查询制品库-制品列表 * - * @param enterpriseIdentifier 企业表示 + * @param enterpriseIdentifier 组织表示 * @param componentSearchVo 制品库-制品 * @param isProduct * @return 制品库-制品集合 @@ -63,7 +63,7 @@ public interface IPmsProductLibraryComponentService { /** * 获取制品文件详情 * - * @param enterpriseIdentifier 企业标识 + * @param enterpriseIdentifier 组织标识 * @param repoName 制品库标识 * @param assetId 制品文件标识 * @param isProduct 是否产品库 @@ -74,7 +74,7 @@ public interface IPmsProductLibraryComponentService { /** * 获取制品详情 * - * @param enterpriseIdentifier 企业标识 + * @param enterpriseIdentifier 组织标识 * @param repoName 制品库标识 * @param componentId 制品标识 * @param isProduct 是否产品库 @@ -85,7 +85,7 @@ public interface IPmsProductLibraryComponentService { /** * 获取制品文件夹是否能删除状态 * - * @param enterpriseIdentifier 企业标识 + * @param enterpriseIdentifier 组织标识 * @param componentSearchVo 文件夹查询条件 * @param isProduct 是否产品库 * @return 能否删除状态 @@ -99,7 +99,7 @@ public interface IPmsProductLibraryComponentService { /** * 删除制品 * - * @param enterpriseIdentifier 企业标识 + * @param enterpriseIdentifier 组织标识 * @param repoName 制品库标识 * @param snapshotName * @param assetId 制品文件 diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryProductRepoService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryProductRepoService.java index 82b4034b0..b61f24a8d 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryProductRepoService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryProductRepoService.java @@ -26,7 +26,7 @@ public interface IPmsProductLibraryProductRepoService { /** * 查询产品库列表 * - * @param enterpriseIdentifier 企业标识 + * @param enterpriseIdentifier 组织标识 * @param name 产品库标识 * @return 产品库列表 */ @@ -69,7 +69,7 @@ public interface IPmsProductLibraryProductRepoService { /** * 查询关键制品列表 * - * @param enterpriseIdentifier 企业标识 + * @param enterpriseIdentifier 组织标识 * @param componentSearchVo 查询条件 * @return 制品列表 */ diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryRepositoriesService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryRepositoriesService.java index 8717f9622..b974549f3 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryRepositoriesService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryRepositoriesService.java @@ -33,7 +33,7 @@ public interface IPmsProductLibraryRepositoriesService { /** * 查询制品仓库分页列表 * - * @param enterpriseIdentifier 企业表示 + * @param enterpriseIdentifier 组织表示 * @param searchVo 搜索制品库标识 * @return 制品仓库分页列表 */ 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 3647333c8..868cb80cb 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 @@ -92,7 +92,7 @@ public class PmsProductLibraryComponentServiceImpl implements IPmsProductLibrary /** * 查询制品库-制品列表 * - * @param enterpriseIdentifier 企业标识 + * @param enterpriseIdentifier 组织标识 * @param componentSearchVo 制品库-制品 * @param isProduct * @return 制品库-制品 diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryProductRepoServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryProductRepoServiceImpl.java index 311bc6e05..b4fbbe7ad 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryProductRepoServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryProductRepoServiceImpl.java @@ -107,7 +107,7 @@ public class PmsProductLibraryProductRepoServiceImpl implements IPmsProductLibra Integer count = pmsProductLibraryRepositoriesMapper.selectPmsProductLibraryRepositoriesByNameCount( productRepositoriesInputVo.getName(), productRepositoriesInputVo.getEnterpriseIdentifier(), productRepositoriesInputVo.getFormat()); if (count > 0) { - throw new ServiceException("该产品库标识在当前企业下已存在(产品库标识[%s])", productRepositoriesInputVo.getName()); + throw new ServiceException("该产品库标识在当前组织下已存在(产品库标识[%s])", productRepositoriesInputVo.getName()); } NexusHostedRepoInputVo requestBody = productRepositoriesInputVo.toNexusRepoDataVo(); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryRepositoriesServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryRepositoriesServiceImpl.java index 83e0ebd8e..68d562af8 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryRepositoriesServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryRepositoriesServiceImpl.java @@ -84,7 +84,7 @@ public class PmsProductLibraryRepositoriesServiceImpl implements IPmsProductLibr Integer count = pmsProductLibraryRepositoriesMapper.selectPmsProductLibraryRepositoriesByNameCount( groupRepositoriesInputVo.getName(), groupRepositoriesInputVo.getEnterpriseIdentifier(), groupRepositoriesInputVo.getFormat()); if (count > 0) { - throw new ServiceException("该制品库标识在当前企业下已存在(制品库标识[%s])", groupRepositoriesInputVo.getName()); + throw new ServiceException("该制品库标识在当前组织下已存在(制品库标识[%s])", groupRepositoriesInputVo.getName()); } checkGroupMemberRepoList(groupRepositoriesInputVo); NexusGroupRepoInputVo requestBody = groupRepositoriesInputVo.toNexusGroupRepoInputVo(); @@ -168,13 +168,13 @@ public class PmsProductLibraryRepositoriesServiceImpl implements IPmsProductLibr Integer nameCount = pmsProductLibraryRepositoriesMapper.selectPmsProductLibraryRepositoriesByNameCount( hostedPmsProductLibraryRepositoriesInputVo.getName(), hostedPmsProductLibraryRepositoriesInputVo.getEnterpriseIdentifier(), hostedPmsProductLibraryRepositoriesInputVo.getFormat()); if (nameCount > 0) { - throw new ServiceException("该制品库标识在当前企业下已存在(制品库标识[%s])", hostedPmsProductLibraryRepositoriesInputVo.getName()); + throw new ServiceException("该制品库标识在当前组织下已存在(制品库标识[%s])", hostedPmsProductLibraryRepositoriesInputVo.getName()); } // 校验制品库别名 - Integer aliasCount = pmsProductLibraryRepositoriesMapper.selectPmsProductLibraryRepositoriesByAliasCount( + PmsProductLibraryRepositories aliasRepo = pmsProductLibraryRepositoriesMapper.selectPmsProductLibraryRepositoriesByAlias( hostedPmsProductLibraryRepositoriesInputVo.getAlias(), hostedPmsProductLibraryRepositoriesInputVo.getEnterpriseIdentifier(), hostedPmsProductLibraryRepositoriesInputVo.getFormat()); - if (aliasCount > 0) { - throw new ServiceException("该制品库标识在当前企业下已存在(制品库标识[%s])", hostedPmsProductLibraryRepositoriesInputVo.getName()); + if (aliasRepo != null) { + throw new ServiceException("该制品库名称在当前组织下已存在(制品库名称[%s])", hostedPmsProductLibraryRepositoriesInputVo.getAlias()); } checkInputParameter(hostedPmsProductLibraryRepositoriesInputVo); NexusHostedRepoInputVo requestBody = hostedPmsProductLibraryRepositoriesInputVo.toNexusRepoDataVo(); @@ -228,12 +228,21 @@ public class PmsProductLibraryRepositoriesServiceImpl implements IPmsProductLibr */ @Override public int updateHostedPmsProductLibraryRepositories(HostedRepositoriesOperateVo hostedRepositoriesOperateVo) { + if (StringUtils.isBlank(hostedRepositoriesOperateVo.getAlias())) { + throw new ServiceException("制品库名称不能为空"); + } PmsProductLibraryRepositories oldRepo = selectPmsProductLibraryRepositoriesByName( hostedRepositoriesOperateVo.getEnterpriseIdentifier(), hostedRepositoriesOperateVo.getName()); checkLockRepositoryStatus(hostedRepositoriesOperateVo.getEnterpriseIdentifier(), oldRepo.getId()); hostedRepositoriesOperateVo.setFormat(oldRepo.getFormat()); hostedRepositoriesOperateVo.setId(oldRepo.getId()); + // 校验制品库别名 + PmsProductLibraryRepositories aliasRepo = pmsProductLibraryRepositoriesMapper.selectPmsProductLibraryRepositoriesByAlias( + hostedRepositoriesOperateVo.getAlias(), hostedRepositoriesOperateVo.getEnterpriseIdentifier(), hostedRepositoriesOperateVo.getFormat()); + if (aliasRepo != null && !aliasRepo.getId().equals(oldRepo.getId())) { + throw new ServiceException("该制品库名称在当前组织下已存在(制品库名称[%s])", hostedRepositoriesOperateVo.getAlias()); + } checkInputParameter(hostedRepositoriesOperateVo); // 构建更新对象 PmsProductLibraryRepositories pmsProductLibraryRepositories = hostedRepositoriesOperateVo.toPmsProductLibraryRepositories(); 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 4b3f3ca34..d0f609725 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 @@ -135,10 +135,8 @@ and pe.enterprise_identifier = #{pmsEnterpriseIdentifier} and pplr.snapshot_name IS NOT NULL - + where pplr.alias = #{alias} and pe.enterprise_identifier = #{pmsEnterpriseIdentifier}