From 88873369f624e086a8c0bbb304961548c345db4a Mon Sep 17 00:00:00 2001
From: zhaochengming <18706295423@163.com>
Date: Sat, 26 Mar 2022 13:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8D=E7=A7=B0=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pms/ocp/controller/OcpApiTreeController.java   |  5 +++++
 src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java |  4 ++++
 .../pms/ocp/service/impl/OcpApiTreeServiceImpl.java    | 10 ++++++----
 src/main/resources/mapper/OcpApiTreeMapper.xml         |  6 ++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java
index c309b06..f35f528 100644
--- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java
+++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java
@@ -12,6 +12,7 @@ import com.pms.ocp.service.OcpApiTreeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -48,7 +49,11 @@ public class OcpApiTreeController {
     @ApiOperation("服务树分类--新增")
     public ResponseVO inseter(@RequestBody OcpApiGroup ocpApiGroup){
         OcpApiGroup ocpApiGroup1 = service.insertTree(ocpApiGroup);
+        if (StringUtils.isBlank(ocpApiGroup1.getApiGroupName())){
+            return ResponseVO.error("服务名称已经存在");
+        }else {
             return ResponseVO.ok(ocpApiGroup1);
+        }
 
     }
 
diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
index aeacd30..6feda47 100644
--- a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
@@ -42,4 +42,8 @@ public interface OcpApiTreeMapper extends BaseMapper<OcpApiGroup> {
 
   //根据code查询是否含有下级服务
     List<OcpApiGroup> selectGroupPcode(String apiGroupCode);
+
+
+//groupName重复问题
+ List<OcpApiGroup> selectGroupName(String apiGroupName);
 }
diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
index bbde401..3a7cf17 100644
--- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
@@ -78,11 +78,13 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
         Timestamp timestamp = new Timestamp(System.currentTimeMillis());
         String code = RandomStringUtils.getRandomString(6);
         boolean flag = true;
-        List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
-        Stream<OcpApiGroup> ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode()));
-        Stream<OcpApiGroup> apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName()));
+//        List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
+//        Stream<OcpApiGroup> ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode()));
+//        Stream<OcpApiGroup> apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName()));
+        List<OcpApiGroup> ocpApiGroups1 = mapper.selectGroupName(ocpApiGroup.getApiGroupName());
         OcpApiGroup ocpApi = new OcpApiGroup();
-        if (!(StringUtils.isBlank(apiGroupStream1.toString()))) {
+
+        if (ocpApiGroups1.size() == 0) {
 
             ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType());
             BeanUtils.copyProperties(ocpApiGroup, ocpApi);
diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml
index b4d115e..5a857eb 100644
--- a/src/main/resources/mapper/OcpApiTreeMapper.xml
+++ b/src/main/resources/mapper/OcpApiTreeMapper.xml
@@ -35,4 +35,10 @@
      SELECT * FROM ocp_api_group where api_group_pcode = #{apiGroupCode};
     </select>
 
+
+<!--    根据名称查询名称是否重复-->
+    <select id="selectGroupName" resultType="com.pms.ocp.model.entity.OcpApiGroup">
+     SELECT * FROM ocp_api_group where api_group_name = #{apiGroupName};
+    </select>
+
 </mapper>
\ No newline at end of file
-- 
2.26.0