From 8875e5a311a6bac235921534a6e6676c5cebe256 Mon Sep 17 00:00:00 2001 From: zhaochengming <18706295423@163.com> Date: Mon, 14 Mar 2022 10:58:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=B5=E5=91=88=E6=98=8E=20--=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E6=9C=8D=E5=8A=A1=E6=A0=91=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocp/controller/OcpApiTreeController.java | 4 +- .../com/pms/ocp/mapper/OcpApiTreeMapper.java | 5 +- .../com/pms/ocp/model/entity/OcpApiGroup.java | 1 + .../pms/ocp/service/OcpApiTreeService.java | 2 +- .../service/impl/OcpApiTreeServiceImpl.java | 32 +++++-------- .../ocp/service/impl/TenantServiceImpl.java | 3 -- .../resources/mapper/OcpApiTreeMapper.xml | 17 +++++-- src/main/resources/mapper/OcpTenantGroup.xml | 46 +++++++++++++++++++ 8 files changed, 79 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java index 3b24724..22cdc6b 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java @@ -42,8 +42,8 @@ public class OcpApiTreeController { @PostMapping("/instertree") @ApiOperation("服务树分类--新增") - public ResponseVO inseter(@RequestBody OcpApiGroupDtos ocpApiGroupDtos){ - boolean flag = service.insertTree(ocpApiGroupDtos); + public ResponseVO inseter(@RequestBody OcpApiGroup ocpApiGroup){ + boolean flag = service.insertTree(ocpApiGroup); if (flag){ return ResponseVO.ok(); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java index c4ad7ec..3e6f5e7 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java @@ -32,5 +32,8 @@ public interface OcpApiTreeMapper extends BaseMapper { List selectThreeApiGroupsList(Long apiGroupPromotionType, String apiGroupCode); - List selectList(Long apiGroupPromotionType, String apiGroupCode,Long apiGroupLevel); + List selectLists(Long apiGroupPromotionType, String apiGroupCode,Long apiGroupLevel); + +//code重复问题 + List selectGroupCode(); } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java index f2b40d6..632463f 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java @@ -16,6 +16,7 @@ import java.util.List; @TableName("ocp_api_group") @ApiModel("服务分类表") public class OcpApiGroup { + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") private String objId; diff --git a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java index 7e3d79e..0859ee1 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java @@ -21,7 +21,7 @@ public interface OcpApiTreeService extends IService { /** * 新增服务分类 */ - boolean insertTree(OcpApiGroupDtos ocpApiGroupDtos); + boolean insertTree(OcpApiGroup ocpApiGroup); /* 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 3a1cb73..11a7e4b 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -62,30 +62,19 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); - for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - if (ocpApiGroup.getApiGroupCode().equals(ocpApiGroupDtos.getApiGroupCode())) { - flag = false; - break; - } - } - if (flag == true) { - OcpApiGroup ocpApiGroup1 = new OcpApiGroup(); - ocpApiGroup1.setObjId(""); - ocpApiGroup1.setApiGroupMtime(timestamp); - ocpApiGroup1.setApiGroupCtime(timestamp); - BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiGroup1); - ocpApiGroup1.setApiGroupCode(code); - mapper.insert(ocpApiGroup1); - } + ocpApiGroup.setObjId(""); + ocpApiGroup.setApiGroupMtime(timestamp); + ocpApiGroup.setApiGroupCtime(timestamp); + ocpApiGroup.setApiGroupPcode(ocpApiGroup.getApiGroupCode()); + ocpApiGroup.setApiGroupCode(code); + mapper.insert(ocpApiGroup); return flag; } @@ -150,8 +139,11 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectTwoApiGroups(pageGroupDto.getApiGroupPromotionType()); pageInfo.setRecords(ocpApiGroups); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType,pageGroupDto.getApiGroupPromotionType()); + mapper.selectPage(pageInfo,lambdaQueryWrapper); }else if (!(StringUtils.isBlank(pageGroupDto.getApiGroupCode()))){ - List ocpApiGroups = mapper.selectList(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel()); + List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel()); LambdaQueryWrapper lwq = new LambdaQueryWrapper<>(); pageInfo.setRecords(ocpApiGroups); mapper.selectPage(pageInfo, lwq); diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java index 5301d1f..c07cbe8 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -86,13 +86,10 @@ public class TenantServiceImpl extends ServiceImpl ocpTenantGroup.setTenantGroupVersion("1.0"); } - OcpTenantBase ocpTenantBase = new OcpTenantBase(); - BeanUtils.copyProperties(tenanBaseDto,ocpTenantBase); if ("null".equals(tenanBaseDto.getTenantGroupCode())){ group.setTenantGroupCode(randomString); } tenantMapper.insert(tenanBaseDto); - tenantBasicMapper.insert(ocpTenantBase); return falg; } diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml index f2b742b..272b0e2 100644 --- a/src/main/resources/mapper/OcpApiTreeMapper.xml +++ b/src/main/resources/mapper/OcpApiTreeMapper.xml @@ -1,19 +1,28 @@ - + - + - + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/OcpTenantGroup.xml b/src/main/resources/mapper/OcpTenantGroup.xml index 648f425..c017177 100644 --- a/src/main/resources/mapper/OcpTenantGroup.xml +++ b/src/main/resources/mapper/OcpTenantGroup.xml @@ -25,6 +25,52 @@ + + + -- 2.26.0