diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java index 7fc57d7339a687e772591de1efc90ac4dce57ec4..7db3029b137fc0d51532a1cd28e49430e4894692 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantController.java @@ -11,6 +11,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -50,8 +51,8 @@ public class OcpTenantController { @ApiModelProperty("新增应用") public ResponseVO tenantInster(@RequestBody TenanBaseDto TenanBaseDto){ OcpTenantGroup tenanInster = tenantService.getTenanInster(TenanBaseDto); - if ("".equals(tenanInster)){ - return ResponseVO.error("应用添加失败!"); + if ("1".equals(tenanInster.getNum())){ + return ResponseVO.error("1"); } return ResponseVO.ok(tenanInster); diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java index 19ac022bce15f5f7ab9338d49d49d5f0701cb946..215d548e38cc3cf16f31eb65805ab7f52a6f01dd 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java @@ -116,6 +116,29 @@ public class OcpTenantGroup implements Serializable { @ApiModelProperty("分类等级") @TableField(exist = false) private String level; + @ApiModelProperty("查询等级") + @TableField(exist = false) + private String lev; + + @ApiModelProperty("判断是否新增成功") + @TableField(exist = false) + private String num; + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } public String getClassIfy() { return classIfy; 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 bb19c3457572332aa17a0b6b88f8706f764bf530..6255b3f00f103a7f272f8786bbc1316c77e19aa7 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -11,10 +11,12 @@ import com.pms.ocp.mapper.TenantBasicManagementMapper; import com.pms.ocp.mapper.TenantMapper; import com.pms.ocp.model.dto.*; import com.pms.ocp.model.entity.ModelAudit; +import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.service.TenantService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.NoUniqueBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -77,25 +79,35 @@ public class TenantServiceImpl extends ServiceImpl group.setTenantGroupMtime(timestamp); group.setTenantGroupVersion("1.0"); group.setTenantGroupCode(randomString); - if("".equals(tenanBaseDto.getTenantGroupLevel())){ - group.setTenantGroupLevel("Middleground"); - } + if ("Middleground".equals(tenanBaseDto.getTenantGroupLevel())){ group.setTenantGroupLevel("sys_center"); - } - if ("sys_center".equals(tenanBaseDto.getTenantGroupLevel())){ + } else if ("sys_center".equals(tenanBaseDto.getTenantGroupLevel())){ group.setTenantGroupLevel("api_group"); + }else { + group.setTenantGroupLevel("Middleground"); } group.setClassIfy(tenanBaseDto.getTenantGroupCompanyCode()); + + String tenantGroupCompanyCode = tenanBaseDto.getTenantGroupName(); //判断是否含有相同的分类名称 + List ocpTenantGroupList = tenantMapper.selectList(null); + for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) { + String tenantGroupCompanyCode1 = ocpTenantGroup.getTenantGroupName(); + if (tenantGroupCompanyCode.equals(tenantGroupCompanyCode1)){ + falg = false; + group.setNum("1"); + } + } + + if (falg) { tenanBaseDto.setClassIfy(tenanBaseDto.getTenantGroupCode()); tenantMapper.insert(group); } - - return group; + } /** @@ -136,18 +148,11 @@ public class TenantServiceImpl extends ServiceImpl boolean flag = true; LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper lambdaQueryWrapper = wrapper.eq(OcpTenantGroup::getTenantGroupPcode, ocpTenantGroup1.getTenantGroupCode()); - if (!(StringUtils.isBlank(lambdaQueryWrapper.toString()))){ + if (StringUtils.isBlank(lambdaQueryWrapper.toString())){ tenantMapper.deleteById(objId); }else { flag = false; } - - - - - - - return flag; }