diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java index c309b06e3f3b654bbb1316825ab2733f37ee77ba..f35f528daed2e9c317e90a6c8f8bbbbd2579bc7d 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 aeacd308995b3db5602b3ee5721001e92942e0bd..6feda47b7c9b35b65e538212fac11f6964e6cafc 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 { //根据code查询是否含有下级服务 List selectGroupPcode(String apiGroupCode); + + +//groupName重复问题 + List 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 bbde401a18d2a4f5e74a8d6ca14e445bdfad08f6..3a7cf17f2ee5addd32b710979c630cf9da2a0d3c 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 ocpApiGroups = mapper.selectList(null); - Stream ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode())); - Stream apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName())); +// List ocpApiGroups = mapper.selectList(null); +// Stream ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode())); +// Stream apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName())); + List 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 b4d115ed0e08b66e2d44739837f3047332bf6d2e..5a857ebf7dcd941b170a3e706ec8e77aea9b92eb 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}; + + + + \ No newline at end of file