Skip to content

O
operation-control-platform
Commit d89a3f87 authored by itcast's avatar itcast
Browse files
Options

服务库服务基础管理接口-修改版

parent b95625cd
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 68 deletions
src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
View file @ d89a3f87
......@@ -188,7 +188,6 @@ public class ApiBasicManagementController {
return apiBasicManagementService.apiIssue(apiCodes);
}
}
@ApiOperation("服务列表")
......@@ -210,12 +209,4 @@ public class ApiBasicManagementController {
List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupCode,apiGroupPromotionType);
return ResponseVO.ok(apiTreeGroupDtos);
}
// @PostMapping("/apiTree")
// @ApiOperation("服务列表2")
// public ResponseVO queryTreeData(@RequestBody WholeLinkParamDto wholeLinkParamDto) {
// return apiBasicManagementService.queryApiTreeData(wholeLinkParamDto);
// }
}
src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
View file @ d89a3f87
package com.pms.ocp.controller;
import com.baomidou.mybatisplus.extension.api.R;
import com.github.pagehelper.PageInfo;
import com.pms.ocp.model.dto.*;
import com.pms.ocp.model.entity.OcpApiGroup;
import com.pms.ocp.model.entity.OcpTenantGroup;
import com.pms.ocp.model.vo.Menu;
import com.pms.ocp.model.vo.OcpApiBaseVo;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.TenantBasicManagementService;
import com.pms.ocp.service.TenantService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
......@@ -30,6 +33,7 @@ public class TenantBasicManagementController {
@Autowired
private TenantService tenantService;
@ApiOperation("条件查询")
@GetMapping("/queryOcpTenantBaseDto")
public ResponseVO<List<OcpTenantBaseDto>> queryOcpTenantBaseDto(
......@@ -89,19 +93,13 @@ public class TenantBasicManagementController {
}
@ApiOperation("应用列表")
@GetMapping("/tenantListQuery")
@GetMapping("/tenantListQuery")
public ResponseVO<PageInfo<OcpTenantBaseDto>> tenantListQuery(HttpServletRequest request, TenantDto tenantDto) {
return tenantBasicManagementService.getBaseByGroupCode(tenantDto);
}
@ApiOperation("应用树层级2")
@GetMapping("/baseTreeOther")
public ResponseVO<List<GroupDto>> baseTreeOther(@RequestParam(required = false) String tenantGroupCode) {
List<GroupDto> list = tenantBasicManagementService.baseTreeOther(tenantGroupCode);
return ResponseVO.ok(list);
}
}
src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java
View file @ d89a3f87
......@@ -18,5 +18,5 @@ public interface OcpTenantGroupMapper extends BaseMapper<OcpTenantGroup> {
List<OcpTenantBaseDto> selectPageLists(TenantDto tenantDto);
List<GroupDto> selectAll();
}
src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java
View file @ d89a3f87
......@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.dto.GroupDto;
import com.pms.ocp.model.dto.OcpTenantBaseDto;
import com.pms.ocp.model.entity.OcpTenantBase;
import com.pms.ocp.model.vo.CompanyVo;
import com.pms.ocp.model.vo.TenantGroupVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -14,7 +16,9 @@ import java.util.List;
public interface TenantBasicManagementMapper extends BaseMapper<OcpTenantBase> {
List<OcpTenantBaseDto> queryOcpTenantBaseDto(@Param("keyword") String keyword,@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantUnit") String tenantUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("tenantCode") String tenantCode, @Param("pageSize") Integer pageSize, @Param("pageNum") Integer pageNum);
// List<OcpTenantBaseDto> queryOcpTenantBaseDto(@Param("keyword") String keyword,@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantUnit") String tenantUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("tenantCode") String tenantCode, @Param("pageSize") Integer pageSize, @Param("pageNum") Integer pageNum);
List<GroupDto> select(String tenantGroupCode);
List<OcpTenantBaseDto> queryOcpTenantBaseDto(String tenantGroupCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, String tenantCode, Integer pageSize, Integer pageNum);
}
src/main/java/com/pms/ocp/model/entity/PmsCompany.java 0 → 100644
View file @ d89a3f87
package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
* 服务表(PmsZyApi)实体类
*
* @author wangsufu
* @since 2022-01-04 20:46:09
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@TableName("pms_company")
@ApiModel(value = "PMS网省公司表", description = "PMS网省公司表")
public class PmsCompany implements Serializable {
private static final long serialVersionUID = -79779908395545838L;
@ApiModelProperty(value = "id")
private Integer id;
@ApiModelProperty(value = "公司名称")
private String companyName;
@ApiModelProperty(value = "公司代码")
private String companyCode;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "公司名称简写")
private String companyShortName;
@ApiModelProperty(value = "公司层级")
private String companyLevel;
@ApiModelProperty(value = "公司排序")
private Integer companySort;
}
src/main/java/com/pms/ocp/model/vo/CompanyTenantVo.java 0 → 100644
View file @ d89a3f87
package com.pms.ocp.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
@ApiModel(value = "网省公司Vo", description = "网省公司Vo")
public class CompanyTenantVo {
@ApiModelProperty(value = "公司名称")
private String companyName;
@ApiModelProperty(value = "公司code")
private String companyCode;
@ApiModelProperty(value = "应用名称")
private String tenantName;
@ApiModelProperty(value = "应用code")
private String tenantCode;
}
src/main/java/com/pms/ocp/model/vo/CompanyVo.java 0 → 100644
View file @ d89a3f87
package com.pms.ocp.model.vo;
import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.io.Serializable;
@Data
@AllArgsConstructor
@ApiModel(value = "网省公司Vo", description = "网省公司Vo")
public class CompanyVo implements Serializable {
private String companyName;
private String companyCode;
}
src/main/java/com/pms/ocp/model/vo/TenantGroupVo.java 0 → 100644
View file @ d89a3f87
package com.pms.ocp.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "网省公司Vo", description = "网省公司Vo")
public class TenantGroupVo {
@ApiModelProperty(value = "应用组code")
private String tenantGroupCode;
@ApiModelProperty(value = "应用组名称")
private String tenantGroupName;
}
src/main/java/com/pms/ocp/service/TenantBasicManagementService.java
View file @ d89a3f87
......@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
import com.pms.ocp.model.dto.GroupDto;
import com.pms.ocp.model.dto.OcpTenantBaseDto;
import com.pms.ocp.model.dto.TenantDto;
import com.pms.ocp.model.dto.WholeLinkParamDto;
import com.pms.ocp.model.entity.OcpApiGroup;
import com.pms.ocp.model.entity.OcpTenantBase;
import com.pms.ocp.model.entity.OcpTenantGroup;
......@@ -68,12 +69,6 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
* @return
*/
ResponseVO<PageInfo<OcpTenantBaseDto>> getBaseByGroupCode(TenantDto tenantDto);
/**
* 应用树
* @param tenantGroupCode
* @return
*/
List<GroupDto> baseTreeOther(String tenantGroupCode);
......
src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
View file @ d89a3f87
......@@ -114,14 +114,6 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
}
// public OcpApiBaseDto queryOcpApiBaseDto(String apiCode, String keyword, String apiUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) {
// //String[] split = apiUnits.split(",");
//// List<String> list = Arrays.asList(split);
// pageSize = (pageSize - 1) * pageNum;
// OcpApiBaseDto ocpApiBaseDto = apiBasicManagementMapper.queryOcpApiBaseDto(keyword, apiUnits, startTime, endTime, apiCode, pageSize, pageNum);
// return ocpApiBaseDto;
// }
/**
* 导入添加到数据库
*
......
src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
View file @ d89a3f87
......@@ -11,8 +11,12 @@ import com.pms.ocp.mapper.TenantBasicManagementMapper;
import com.pms.ocp.model.dto.GroupDto;
import com.pms.ocp.model.dto.OcpTenantBaseDto;
import com.pms.ocp.model.dto.TenantDto;
import com.pms.ocp.model.dto.WholeLinkParamDto;
import com.pms.ocp.model.entity.*;
import com.pms.ocp.model.vo.CompanyTenantVo;
import com.pms.ocp.model.vo.CompanyVo;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.model.vo.TenantGroupVo;
import com.pms.ocp.service.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
......@@ -247,16 +251,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
* @param tenantGroupCode
* @return
*/
@Override
public List<GroupDto> baseTreeOther(String tenantGroupCode) {
List<GroupDto> group = null;
if (StringUtils.isBlank(tenantGroupCode)) {
group= ocpTenantGroupMapper.selectAll();
} else {
group= tenantBasicManagementMapper.select(tenantGroupCode);
}
return group;
}
......
src/main/resources/mapper/OcpGroup.xml
View file @ d89a3f87
......@@ -17,17 +17,19 @@
<select id="tenantBaseTreeOther" resultType="com.pms.ocp.model.dto.GroupDto">
select
tenant_group_code,tenant_group_name,tenant_group_pcode ,tenant_group_level from ocp_tenant_group
where is_delete = 0
select otb.tenant_name,otb.tenant_code,
otg.tenant_group_code,otg.tenant_group_name,otg.tenant_group_pcode ,otg.tenant_group_level from ocp_tenant_group
otg
left join ocp_tenant_base otb on otg.tenant_group_code=otb.tenant_group_code
where otg.is_delete = 0
<if test="tenantGroupCode == null">
and tenant_group_pcode is null
and otg.tenant_group_pcode = ''
</if>
<if test="tenantGroupCompanyCode !=null and tenantGroupCompanyCode!=''">
and tenant_group_company_code=#{tenantGroupCompanyCode}
and otg.tenant_group_company_code=#{tenantGroupCompanyCode}
</if>
<if test="tenantGroupCode !=null and tenantGroupCode!=''">
and tenant_group_pcode=#{tenantGroupCode}
and otg.tenant_group_pcode=#{tenantGroupCode}
</if>
......@@ -55,9 +57,9 @@
<!-- <if test="tenantCode !=null and tenantCode!=''">-->
<!-- and otb.tenant_code = #{tenantCode}-->
<!-- </if>-->
<if test="tenantGroupCode !=null and tenantGroupCode!=''">
and otb.tenant_group_code = #{tenantGroupCode}
</if>
<!-- <if test="tenantGroupCode !=null and tenantGroupCode!=''">-->
<!-- and otb.tenant_group_code = #{tenantGroupCode}-->
<!-- </if>-->
<if test="startTime !=null ">
<![CDATA[
......@@ -76,10 +78,5 @@
and otb.tenant_code like CONCAT('%', #{keyword}::text,'%')
</if>
</select>
<select id="selectAll" resultType="com.pms.ocp.model.dto.GroupDto">
<!-- <select id="selectAll" resultType="java.util.List">-->
select tenant_group_name ,tenant_group_code from ocp_tenant_group where is_delete = 0
<!-- </select>-->
</select>
</mapper>
src/main/resources/mapper/TenantBasicManagementMapper.xml
View file @ d89a3f87
......@@ -3,16 +3,16 @@
<mapper namespace="com.pms.ocp.mapper.TenantBasicManagementMapper">
<resultMap id="ctbMap" type="com.pms.ocp.model.dto.OcpTenantBaseDto">
<result property="objId" column="obj_id"/>
<result property="tenantCode" column="api_code"/>
<result property="tenantName" column="api_name"/>
<result property="tenantGroupName" column="cluster_name"/>
<result property="tenantUrl" column="space_name"/>
<result property="clusterName" column="api_unit"/>
<result property="spaceName" column="api_ctime"/>
<result property="deploymentName" column="api_state"/>
<result property="tenantZone" column="api_url"/>
<result property="tenantCtime" column="api_code"/>
<result property="tenantUnit" column="api_code"/>
<result property="tenantCode" column="tenant_code"/>
<result property="tenantName" column="tenant_name"/>
<result property="tenantGroupName" column="tenant_group_name"/>
<result property="tenantUrl" column="tenant_url"/>
<result property="clusterName" column="cluster_name"/>
<result property="spaceName" column="space_name"/>
<result property="deploymentName" column="deployment_name"/>
<result property="tenantZone" column="tenant_zone"/>
<result property="tenantCtime" column="tenant_ctime"/>
<result property="tenantUnit" column="tenant_unit"/>
</resultMap>
<select id="queryOcpTenantBaseDto" resultMap="ctbMap">
......@@ -27,7 +27,7 @@
and otb.tenant_code=#{tenantCode}
</if>
<if test="tenantGroupCode!=null and tenantGroupCode!=''">
and otg.tenant_group_code=#{tenantGroupCode}
and otb.tenant_group_code=#{tenantGroupCode}
</if>
<if test="tenantCode!=null and tenantCode!=''">
......@@ -62,4 +62,9 @@
select tenant_name from ocp_tenant_base
where tenant_group_code =#{tenantGroupCode}
</select>
</mapper>
\ No newline at end of file
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