Commit fc078459 authored by 胡秀武's avatar 胡秀武

Merge remote-tracking branch 'origin/master'

parents 32346a6a cb20a866
...@@ -11,6 +11,7 @@ import io.swagger.annotations.Api; ...@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -36,7 +37,7 @@ public class OcpTenantController { ...@@ -36,7 +37,7 @@ public class OcpTenantController {
@GetMapping("/tenantOnetree") @GetMapping("/tenantOnetree")
@ApiModelProperty("应用树分类") @ApiModelProperty("应用树分类")
private List<OcpTenantGroup> getTenantTree(OcpTenantGroup ocpTenantGroup) { private List<OcpTenantGroup> getTenantTree(OcpTenantGroup ocpTenantGroup) {
List<OcpTenantGroup> tree= tenantService.getTree(ocpTenantGroup.getTenantGroupCompanyCode(),ocpTenantGroup.getTenantGroupCode()); List<OcpTenantGroup> tree= tenantService.getTree(ocpTenantGroup.getTenantGroupCompanyCode(),ocpTenantGroup.getTenantGroupCode(),ocpTenantGroup.getLevel());
return tree; return tree;
} }
@GetMapping("/tenantselect") @GetMapping("/tenantselect")
...@@ -50,8 +51,8 @@ public class OcpTenantController { ...@@ -50,8 +51,8 @@ public class OcpTenantController {
@ApiModelProperty("新增应用") @ApiModelProperty("新增应用")
public ResponseVO tenantInster(@RequestBody TenanBaseDto TenanBaseDto){ public ResponseVO tenantInster(@RequestBody TenanBaseDto TenanBaseDto){
OcpTenantGroup tenanInster = tenantService.getTenanInster(TenanBaseDto); OcpTenantGroup tenanInster = tenantService.getTenanInster(TenanBaseDto);
if ("".equals(tenanInster)){ if ("1".equals(tenanInster.getNum())){
return ResponseVO.error("应用添加失败!"); return ResponseVO.error("1");
} }
return ResponseVO.ok(tenanInster); return ResponseVO.ok(tenanInster);
......
...@@ -113,6 +113,49 @@ public class OcpTenantGroup implements Serializable { ...@@ -113,6 +113,49 @@ public class OcpTenantGroup implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String classIfy; private String classIfy;
@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;
}
public void setClassIfy(String classIfy) {
this.classIfy = classIfy;
}
public String getLev() {
return level;
}
public void setLev(String lev) {
this.level = level;
}
public static long getSerialVersionUID() { public static long getSerialVersionUID() {
return serialVersionUID; return serialVersionUID;
} }
......
...@@ -19,7 +19,7 @@ import java.util.List; ...@@ -19,7 +19,7 @@ import java.util.List;
public interface ApiBasicManagementService extends IService<OcpApiBase> { public interface ApiBasicManagementService extends IService<OcpApiBase> {
/** /**
* 导出的查询 * 导出的查询
* @param apiCode * @param apiCodes
* @return * @return
*/ */
List<OcpApiBaseVo> selectApiExport(String apiCodes); List<OcpApiBaseVo> selectApiExport(String apiCodes);
......
...@@ -16,7 +16,7 @@ public interface TenantService extends IService<OcpTenantGroup> { ...@@ -16,7 +16,7 @@ public interface TenantService extends IService<OcpTenantGroup> {
* 应用树分类管理 * 应用树分类管理
* @return * @return
*/ */
List<OcpTenantGroup> getTree(String tenantGroupCode,String tenantGroupCompanyCode); List<OcpTenantGroup> getTree(String tenantGroupCode,String tenantGroupCompanyCode,String level);
/** /**
* 应用新增 * 应用新增
......
...@@ -25,6 +25,7 @@ import com.pms.ocp.model.entity.OcpApiExtent; ...@@ -25,6 +25,7 @@ import com.pms.ocp.model.entity.OcpApiExtent;
import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpApiGroup;
import com.pms.ocp.model.entity.OcpApiSubs; import com.pms.ocp.model.entity.OcpApiSubs;
import com.pms.ocp.model.vo.*; import com.pms.ocp.model.vo.*;
import com.pms.ocp.service.ApiBasicManagementService; import com.pms.ocp.service.ApiBasicManagementService;
import com.pms.ocp.service.OcpApiExtentService; import com.pms.ocp.service.OcpApiExtentService;
......
...@@ -11,10 +11,12 @@ import com.pms.ocp.mapper.TenantBasicManagementMapper; ...@@ -11,10 +11,12 @@ import com.pms.ocp.mapper.TenantBasicManagementMapper;
import com.pms.ocp.mapper.TenantMapper; import com.pms.ocp.mapper.TenantMapper;
import com.pms.ocp.model.dto.*; import com.pms.ocp.model.dto.*;
import com.pms.ocp.model.entity.ModelAudit; 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.model.entity.OcpTenantGroup;
import com.pms.ocp.service.TenantService; import com.pms.ocp.service.TenantService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -37,15 +39,15 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup> ...@@ -37,15 +39,15 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
* @return * @return
*/ */
@Override @Override
public List<OcpTenantGroup> getTree(String tenantGroupCompanyCode, String tenantGroupCode) { public List<OcpTenantGroup> getTree(String tenantGroupCompanyCode, String tenantGroupCode,String level) {
List<OcpTenantGroup> ocpTenantGroupList = null; List<OcpTenantGroup> ocpTenantGroupList = null;
if (StringUtils.isBlank(tenantGroupCode) && StringUtils.isBlank(tenantGroupCompanyCode)) { if(StringUtils.isBlank(level) ) {
//顶级目录 //顶级目录
ocpTenantGroupList = tenantMapper.oneTenantGroup(); ocpTenantGroupList = tenantMapper.oneTenantGroup();
} else if (!(StringUtils.isBlank(tenantGroupCompanyCode)) && StringUtils.isBlank(tenantGroupCode)) { } else if(StringUtils.isNotBlank(level) && "1".equals(level)) {
//二级目录 //二级目录
ocpTenantGroupList = tenantMapper.selectGroups(tenantGroupCompanyCode); ocpTenantGroupList = tenantMapper.selectGroups(tenantGroupCompanyCode);
} else if (!(StringUtils.isBlank(tenantGroupCompanyCode)) && !(StringUtils.isBlank(tenantGroupCompanyCode))) { } else if (StringUtils.isNotBlank(level) && "2".equals(level) ||"3".equals(level)) {
//三级目录 //三级目录
ocpTenantGroupList = tenantMapper.selectTenantGroups(tenantGroupCode, tenantGroupCompanyCode); ocpTenantGroupList = tenantMapper.selectTenantGroups(tenantGroupCode, tenantGroupCompanyCode);
...@@ -65,9 +67,6 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup> ...@@ -65,9 +67,6 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
boolean falg = true; boolean falg = true;
OcpTenantGroup group = new OcpTenantGroup(); OcpTenantGroup group = new OcpTenantGroup();
String tenantGroupCode = tenanBaseDto.getTenantGroupCode();
List<OcpTenantGroup> ocpTenantGroups = tenantMapper.selectList(null);
String randomString = RandomStringUtils.getRandomString(6); String randomString = RandomStringUtils.getRandomString(6);
Timestamp timestamp = new Timestamp(System.currentTimeMillis()); Timestamp timestamp = new Timestamp(System.currentTimeMillis());
BeanUtils.copyProperties(tenanBaseDto, group); BeanUtils.copyProperties(tenanBaseDto, group);
...@@ -80,22 +79,35 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup> ...@@ -80,22 +79,35 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
group.setTenantGroupMtime(timestamp); group.setTenantGroupMtime(timestamp);
group.setTenantGroupVersion("1.0"); group.setTenantGroupVersion("1.0");
group.setTenantGroupCode(randomString); group.setTenantGroupCode(randomString);
if (tenanBaseDto.getTenantGroupLevel().equals("Middleground")){
if ("Middleground".equals(tenanBaseDto.getTenantGroupLevel())){
group.setTenantGroupLevel("sys_center"); group.setTenantGroupLevel("sys_center");
} } else if ("sys_center".equals(tenanBaseDto.getTenantGroupLevel())){
if (tenanBaseDto.getTenantGroupLevel().equals("sys_center")){
group.setTenantGroupLevel("api_group"); group.setTenantGroupLevel("api_group");
}else {
group.setTenantGroupLevel("Middleground");
} }
group.setClassIfy(tenanBaseDto.getTenantGroupCompanyCode()); group.setClassIfy(tenanBaseDto.getTenantGroupCompanyCode());
String tenantGroupCompanyCode = tenanBaseDto.getTenantGroupName();
//判断是否含有相同的分类名称 //判断是否含有相同的分类名称
List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectList(null);
for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) {
String tenantGroupCompanyCode1 = ocpTenantGroup.getTenantGroupName();
if (tenantGroupCompanyCode.equals(tenantGroupCompanyCode1)){
falg = false;
group.setNum("1");
}
}
if (falg) { if (falg) {
tenanBaseDto.setClassIfy(tenanBaseDto.getTenantGroupCode()); tenanBaseDto.setClassIfy(tenanBaseDto.getTenantGroupCode());
tenantMapper.insert(group); tenantMapper.insert(group);
} }
return group; return group;
} }
/** /**
...@@ -136,12 +148,11 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup> ...@@ -136,12 +148,11 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
boolean flag = true; boolean flag = true;
LambdaQueryWrapper<OcpTenantGroup> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OcpTenantGroup> wrapper = new LambdaQueryWrapper<>();
LambdaQueryWrapper<OcpTenantGroup> lambdaQueryWrapper = wrapper.eq(OcpTenantGroup::getTenantGroupPcode, ocpTenantGroup1.getTenantGroupCode()); LambdaQueryWrapper<OcpTenantGroup> lambdaQueryWrapper = wrapper.eq(OcpTenantGroup::getTenantGroupPcode, ocpTenantGroup1.getTenantGroupCode());
if (!(StringUtils.isBlank(lambdaQueryWrapper.toString()))){ if (StringUtils.isBlank(lambdaQueryWrapper.toString())){
tenantMapper.deleteById(objId); tenantMapper.deleteById(objId);
}else { }else {
flag = false; flag = false;
} }
return flag; return flag;
} }
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</select> </select>
<!--服务树 -查询--> <!--服务树 -查询-->
<select id="selectLists" resultType="com.pms.ocp.model.entity.OcpApiGroup"> <select id="selectLists" resultType="com.pms.ocp.model.entity.OcpApiGroup">
SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_pcode = #{apiGroupCode} and api_group_level = #{apiGroupLevel}; SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_pcode = #{apiGroupCode};
</select> </select>
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
otb.obj_id,otb.tenant_code,otb.tenant_name,otg.tenant_group_name,otb.tenant_url,ote.cluster_name,ote.space_name, otb.obj_id,otb.tenant_code,otb.tenant_name,otg.tenant_group_name,otb.tenant_url,ote.cluster_name,ote.space_name,
otb.tenant_zone,otb.tenant_ctime,otb.tenant_unit otb.tenant_zone,otb.tenant_ctime,otb.tenant_unit
from ocp_tenant_base otb from ocp_tenant_base otb
join ocp_tenant_extent ote on otb.tenant_code=ote.tenant_code
join ocp_tenant_group otg on otb.tenant_group_code =otg.tenant_group_code join ocp_tenant_group otg on otb.tenant_group_code =otg.tenant_group_code
left join ocp_tenant_extent ote on otb.tenant_code=ote.tenant_code
WHERE otg.is_delete=0 WHERE otg.is_delete=0
<if test="apiGroupCodeList !=null "> <if test="apiGroupCodeList !=null ">
and otb.tenant_group_code in and otb.tenant_group_code in
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
<if test="keyword !=null and keyword != '' "> <if test="keyword !=null and keyword != '' ">
and otb.tenant_name like CONCAT('%', #{keyword}::text,'%') and otb.tenant_name like CONCAT('%', #{keyword}::text,'%')
</if> </if>
<!-- <if test="keyword !=null and keyword != '' ">--> <!-- <if test="keyword !=null and keyword != '' ">-->
<!-- and otb.tenant_code like CONCAT('%', #{keyword}::text,'%')--> <!-- and otb.tenant_code like CONCAT('%', #{keyword}::text,'%')-->
<!-- </if>--> <!-- </if>-->
</select> </select>
<select id="selectRegister" resultType="com.pms.ocp.model.entity.OcpTenantGroup"> <select id="selectRegister" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
select * from ocp_tenant_group where is_delete = 0 select * from ocp_tenant_group where is_delete = 0
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<select id="selectGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup"> <select id="selectGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
SELECT * FROM ocp_tenant_group WHERE tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = 'Middleground' ; SELECT * FROM ocp_tenant_group WHERE tenant_group_company_code = #{tenantGroupCompanyCode};
</select> </select>
<!-- 根据创建公司和分类名称获取集合--> <!-- 根据创建公司和分类名称获取集合-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment