From a713407f7fff582dd88f3c14de44c8fab689293e Mon Sep 17 00:00:00 2001
From: OTTO <731554297@qq.com>
Date: Tue, 30 Jul 2024 11:07:40 +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

产品库限制名称不能重复
---
 .../mapper/PmsProductLibraryRepositoriesMapper.java |  3 +--
 .../PmsProductLibraryProductRepoServiceImpl.java    | 13 +++++++++++++
 .../PmsProductLibraryRepositoriesServiceImpl.java   |  8 ++++----
 .../pms/PmsProductLibraryRepositoriesMapper.xml     |  9 ---------
 4 files changed, 18 insertions(+), 15 deletions(-)

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 5df1006d2..6fbc2b91a 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
@@ -87,10 +87,9 @@ public interface PmsProductLibraryRepositoriesMapper {
      *
      * @param alias                   制品库别名
      * @param pmsEnterpriseIdentifier 组织标识
-     * @param format                  制品格式
      * @return 制品库数量
      */
-    PmsProductLibraryRepositories selectPmsProductLibraryRepositoriesByAlias(@Param("alias") String alias, @Param("pmsEnterpriseIdentifier") String pmsEnterpriseIdentifier, @Param("format") String format);
+    PmsProductLibraryRepositories selectPmsProductLibraryRepositoriesByAlias(@Param("alias") String alias, @Param("pmsEnterpriseIdentifier") String pmsEnterpriseIdentifier);
 
     /**
      * 根据制品库标识查找制品库
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 b4fbbe7ad..ed8355e40 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
@@ -80,6 +80,13 @@ public class PmsProductLibraryProductRepoServiceImpl implements IPmsProductLibra
         PmsProductLibraryRepositories oldRepo = selectPmsProductLibraryByName(
                 productRepositoriesOperateVo.getEnterpriseIdentifier(),
                 productRepositoriesOperateVo.getName());
+
+        // 校验制品库别名
+        PmsProductLibraryRepositories aliasRepo = pmsProductLibraryRepositoriesMapper.selectPmsProductLibraryRepositoriesByAlias(
+                productRepositoriesOperateVo.getAlias(), productRepositoriesOperateVo.getEnterpriseIdentifier());
+        if (aliasRepo != null && !aliasRepo.getId().equals(oldRepo.getId())) {
+            throw new ServiceException("该产品库名称在当前组织下已存在(产品库名称[%s])", productRepositoriesOperateVo.getAlias());
+        }
         // 构建更新对象
         PmsProductLibraryRepositories pmsProductLibraryRepositories = productRepositoriesOperateVo.toPmsProductLibraryRepositories();
         pmsProductLibraryRepositories.setId(oldRepo.getId());
@@ -109,6 +116,12 @@ public class PmsProductLibraryProductRepoServiceImpl implements IPmsProductLibra
         if (count > 0) {
             throw new ServiceException("该产品库标识在当前组织下已存在(产品库标识[%s])", productRepositoriesInputVo.getName());
         }
+        // 校验制品库别名
+        PmsProductLibraryRepositories aliasRepo = pmsProductLibraryRepositoriesMapper.selectPmsProductLibraryRepositoriesByAlias(
+                productRepositoriesInputVo.getAlias(), productRepositoriesInputVo.getEnterpriseIdentifier());
+        if (aliasRepo != null) {
+            throw new ServiceException("该产品库名称在当前组织下已存在(产品库名称[%s])", productRepositoriesInputVo.getAlias());
+        }
         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 26cbfcdd3..a9c55ea35 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
@@ -88,7 +88,7 @@ public class PmsProductLibraryRepositoriesServiceImpl implements IPmsProductLibr
         }
         // 校验制品库别名
         PmsProductLibraryRepositories aliasRepo = pmsProductLibraryRepositoriesMapper.selectPmsProductLibraryRepositoriesByAlias(
-                groupRepositoriesInputVo.getAlias(), groupRepositoriesInputVo.getEnterpriseIdentifier(), groupRepositoriesInputVo.getFormat());
+                groupRepositoriesInputVo.getAlias(), groupRepositoriesInputVo.getEnterpriseIdentifier());
         if (aliasRepo != null) {
             throw new ServiceException("该制品库名称在当前组织下已存在(制品库名称[%s])", groupRepositoriesInputVo.getAlias());
         }
@@ -178,7 +178,7 @@ public class PmsProductLibraryRepositoriesServiceImpl implements IPmsProductLibr
         }
         // 校验制品库别名
         PmsProductLibraryRepositories aliasRepo = pmsProductLibraryRepositoriesMapper.selectPmsProductLibraryRepositoriesByAlias(
-                hostedPmsProductLibraryRepositoriesInputVo.getAlias(), hostedPmsProductLibraryRepositoriesInputVo.getEnterpriseIdentifier(), hostedPmsProductLibraryRepositoriesInputVo.getFormat());
+                hostedPmsProductLibraryRepositoriesInputVo.getAlias(), hostedPmsProductLibraryRepositoriesInputVo.getEnterpriseIdentifier());
         if (aliasRepo != null) {
             throw new ServiceException("该制品库名称在当前组织下已存在(制品库名称[%s])", hostedPmsProductLibraryRepositoriesInputVo.getAlias());
         }
@@ -245,7 +245,7 @@ public class PmsProductLibraryRepositoriesServiceImpl implements IPmsProductLibr
         hostedRepositoriesOperateVo.setId(oldRepo.getId());
         // 校验制品库别名
         PmsProductLibraryRepositories aliasRepo = pmsProductLibraryRepositoriesMapper.selectPmsProductLibraryRepositoriesByAlias(
-                hostedRepositoriesOperateVo.getAlias(), hostedRepositoriesOperateVo.getEnterpriseIdentifier(), hostedRepositoriesOperateVo.getFormat());
+                hostedRepositoriesOperateVo.getAlias(), hostedRepositoriesOperateVo.getEnterpriseIdentifier());
         if (aliasRepo != null && !aliasRepo.getId().equals(oldRepo.getId())) {
             throw new ServiceException("该制品库名称在当前组织下已存在(制品库名称[%s])", hostedRepositoriesOperateVo.getAlias());
         }
@@ -279,7 +279,7 @@ public class PmsProductLibraryRepositoriesServiceImpl implements IPmsProductLibr
         groupRepositoriesOperateVo.setId(oldRepo.getId());
         // 校验制品库别名
         PmsProductLibraryRepositories aliasRepo = pmsProductLibraryRepositoriesMapper.selectPmsProductLibraryRepositoriesByAlias(
-                groupRepositoriesOperateVo.getAlias(), groupRepositoriesOperateVo.getEnterpriseIdentifier(), groupRepositoriesOperateVo.getFormat());
+                groupRepositoriesOperateVo.getAlias(), groupRepositoriesOperateVo.getEnterpriseIdentifier());
         if (aliasRepo != null && !aliasRepo.getId().equals(oldRepo.getId())) {
             throw new ServiceException("该制品库名称在当前组织下已存在(制品库名称[%s])", groupRepositoriesOperateVo.getAlias());
         }
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 d0f609725..f32dded44 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
@@ -139,15 +139,6 @@
         <include refid="selectPmsProductLibraryRepositoriesAliasVo"/>
         where pplr.alias = #{alias}
         and pe.enterprise_identifier = #{pmsEnterpriseIdentifier}
-        <choose>
-            <when test="format != null and format != 'product'">
-                and pplr.format != 'product'
-                and pplr.snapshot_name IS NULL
-            </when>
-            <otherwise>
-                and pplr.format = 'product'
-            </otherwise>
-        </choose>
     </select>
 
     <insert id="insertPmsProductLibraryRepositories" parameterType="PmsProductLibraryRepositories"