Commit 7054c353 authored by itcast's avatar itcast

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

parent a31dfb38
......@@ -53,9 +53,9 @@ public class ApiBasicManagementController {
@RequestParam(required = false) int pageSize,
@RequestParam(required = false) int pageNum
) {
OcpApiBaseDto ocpApiBaseDto = apiBasicManagementService.queryOcpApiBaseDto(apiCode, keyword, apiUnits, startTime, endTime, pageSize
List<OcpApiBaseVo> list=apiBasicManagementService.queryOcpApiBaseDto(apiCode, keyword, apiUnits, startTime, endTime, pageSize
, pageNum);
return ResponseVO.ok(ocpApiBaseDto);
return ResponseVO.ok(list);
}
@ApiOperation("导入功能")
......
......@@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RestController;
/**
* @className: AppArrangeController
* @Description:应用分类管理接口
* @atuthor: pei-chenxi
* @DateTime: 2022/3/9 14:15
* @Dscription:应用分类管理接口
* * @atuthor: pei-chenxi
* * @DateTime: 2022/3/9 14:15e
*/
@Slf4j
@RestController
......
package com.pms.ocp.controller;
import com.pms.ocp.model.dto.OcpApiBaseDto;
import com.pms.ocp.model.dto.OcpTenantBaseDto;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.TenantBasicManagementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.sql.Timestamp;
@Slf4j
@RequestMapping("/tenant/basic")
@RestController
@Api(tags = "应用库服务基础管理接口")
public class TenantBasicManagementController {
@Autowired
private TenantBasicManagementService tenantBasicManagementService;
@ApiOperation("条件查询")
@GetMapping("/queryOcpTenantBaseDto")
public ResponseVO queryOcpTenantBaseDto(
@RequestParam(required = false) String keyword,
@RequestParam(required = false) String tenantUnits,
@RequestParam(required = false) Timestamp startTime,
@RequestParam(required = false) Timestamp endTime,
@RequestParam(required = false) int pageSize,
@RequestParam(required = false) int pageNum
) {
OcpTenantBaseDto ocpTenantBaseDto = tenantBasicManagementService.queryOcpTenantBaseDto( keyword, tenantUnits, startTime, endTime, pageSize
, pageNum);
return ResponseVO.ok(ocpTenantBaseDto);
}
}
......@@ -14,5 +14,5 @@ import java.util.List;
public interface ApiBasicManagementMapper extends BaseMapper<OcpApiBase> {
List<OcpApiBaseVo> selectApiExport(List<String> list);
OcpApiBaseDto queryOcpApiBaseDto(@Param("keyword") String keyword,@Param("list") List<String> list, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("apiCode") String apiCode, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum);
List<OcpApiBaseVo> queryOcpApiBaseDto(@Param("keyword") String keyword,@Param("apiUnit") String apiUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("apiCode") String apiCode, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum);
}
package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.dto.OcpTenantBaseDto;
import com.pms.ocp.model.entity.OcpTenantBase;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.sql.Timestamp;
import java.util.List;
@Mapper
public interface TenantBasicManagementMapper extends BaseMapper<OcpTenantBase> {
OcpTenantBaseDto queryOcpApiBaseDto(@Param("keyword") String keyword, @Param("list") List<String> list, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum);
}
......@@ -20,4 +20,6 @@ public class OcpTenantBaseDto extends OcpTenantBase implements Serializable {
private String clusterName;
@ApiModelProperty("命名空间")
private String spaceName;
@ApiModelProperty("部署名称")
private String deploymentName;
}
......@@ -42,7 +42,7 @@ public interface ApiBasicManagementService extends IService<OcpApiBase> {
* @return
*/
// OcpApiBaseDto queryOcpApiBaseDto(ApiBaseDto apiBaseDto);
OcpApiBaseDto queryOcpApiBaseDto(String apiCode, String keyword, String apiUnits, Timestamp startTime, Timestamp endTime,int pageSize,int pageNum);
List<OcpApiBaseVo> queryOcpApiBaseDto(String apiCode, String keyword, String apiUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum);
/**
* 导入的添加到数据库
* @param personList
......@@ -54,4 +54,6 @@ public interface ApiBasicManagementService extends IService<OcpApiBase> {
* @param apiCodes
*/
void apiIssue(String apiCodes);
}
package com.pms.ocp.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.pms.ocp.model.dto.OcpTenantBaseDto;
import com.pms.ocp.model.entity.OcpTenantBase;
import java.sql.Timestamp;
public interface TenantBasicManagementService extends IService<OcpTenantBase> {
/**
* 应用条件查询
* @param keyword
* @param tenantUnits
* @param startTime
* @param endTime
* @param pageSize
* @param pageNum
* @return
*/
OcpTenantBaseDto queryOcpTenantBaseDto(String keyword, String tenantUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum);
}
......@@ -81,6 +81,12 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
}
}
@Override
public List<OcpApiBaseVo> queryOcpApiBaseDto(String apiCode, String keyword, String apiUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) {
pageSize = (pageSize - 1) * pageNum;
return apiBasicManagementMapper.queryOcpApiBaseDto(keyword, apiUnit, startTime, endTime, apiCode, pageSize, pageNum);
}
/**
* 条件查询
*
......@@ -91,13 +97,13 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
* @param endTime
* @return
*/
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, list, startTime, endTime, apiCode, pageSize, pageNum);
return ocpApiBaseDto;
}
// 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;
// }
/**
* 导入添加到数据库
......
package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.mapper.TenantBasicManagementMapper;
import com.pms.ocp.model.dto.OcpApiBaseDto;
import com.pms.ocp.model.dto.OcpTenantBaseDto;
import com.pms.ocp.model.entity.OcpTenantBase;
import com.pms.ocp.service.TenantBasicManagementService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.sql.Timestamp;
import java.util.Arrays;
import java.util.List;
@Service
public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicManagementMapper, OcpTenantBase> implements TenantBasicManagementService {
@Autowired
private TenantBasicManagementMapper tenantBasicManagementMapper;
/**
* 应用条件查询
* @param keyword
* @param tenantUnits
* @param startTime
* @param endTime
* @param pageSize
* @param pageNum
* @return
*/
@Override
public OcpTenantBaseDto queryOcpTenantBaseDto(String keyword, String tenantUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) {
String[] split = tenantUnits.split(",");
List<String> list = Arrays.asList(split);
pageSize = (pageSize - 1) * pageNum;
OcpTenantBaseDto ocpTenantBaseDto = tenantBasicManagementMapper.queryOcpApiBaseDto(keyword, list, startTime, endTime, pageSize, pageNum);
return ocpTenantBaseDto;
}
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pms.ocp.mapper.ApiBasicManagementMapper">
<resultMap id="oabMap" type="com.pms.ocp.model.dto.OcpApiBaseDto">
<result property="objId" column="obj_id"/>
<result property="apiCode" column="api_code"/>
<result property="apiName" column="api_name"/>
<result property="clusterName" column="cluster_name"/>
<result property="spaceName" column="space_name"/>
<result property="apiUnit" column="api_unit"/>
<result property="apiCtime" column="api_ctime"/>
<result property="apiState" column="api_state"/>
<result property="apiUrl" column="api_url"/>
<result property="apiCode" column="api_code"/>
</resultMap>
<select id="selectApiExport" resultType="com.pms.ocp.model.vo.OcpApiBaseVo">
SELECT oab.obj_id,
......@@ -16,7 +27,7 @@
</select>
<select id="queryOcpApiBaseDto" resultType="com.pms.ocp.model.dto.OcpApiBaseDto">
<select id="queryOcpApiBaseDto" resultMap="oabMap">
select oab.obj_id,oab.api_code,oae.api_code,oab.api_name,oae.cluster_name,
oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime from ocp_api_base oab
join ocp_api_extent oae ON oae.api_code = oab.api_code
......@@ -27,9 +38,6 @@
<if test="apiCode!=null and apiCode!=''">
and oae.api_code=#{apiCode}
</if>
<!-- <if test="apiUnit !=null and apiUnit!=''">-->
<!-- and oab.api_unit=#{apiUnit}-->
<!-- </if>-->
<if test="startTime !=null ">
<![CDATA[
and oab.api_ctime >= #{startTime}
......@@ -46,15 +54,16 @@
<if test="keyword !=null and keyword != '' ">
and oab.api_name like CONCAT('%', #{keyword}::text,'%')
</if>
<if test="list!=null">
and oab.api_unit in
<foreach collection="list" index="index" item="apiUnit" open="(" separator="," close=")">
#{apiUnit}
</foreach>
<if test="apiUnit !=null and apiUnit!=''">
and oab.api_unit =#{apiUnit}
</if>
<!-- <if test="list!=null">-->
<!-- and oab.api_unit in-->
<!-- <foreach collection="list" index="index" item="apiUnit" open="(" separator="," close=")">-->
<!-- #{apiUnit}-->
<!-- </foreach>-->
<!-- </if>-->
</where>
limit #{pageNum} offset #{pageSize}
</select>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pms.ocp.mapper.TenantBasicManagementMapper">
<select id="queryOcpApiBaseDto" resultType="com.pms.ocp.model.dto.OcpTenantBaseDto">
select otb.obj_id,otb.tenant_code,otb.tenant_name,otg.tenant_group_name,otb.tenant_url,ote.cluster_name,ote.space_name,
ote.deployment_name,otb.tenant_zone,otb.tenant_ctime,otb.tenant_unit
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
<where>
<if test="startTime !=null ">
<![CDATA[
and otb.tenant_ctime >= #{startTime}
]]>
</if>
<if test="endTime !=null ">
<![CDATA[
and otb.tenant_ctime <= #{endTime}
]]>
</if>
<if test="keyword !=null and keyword != '' ">
and otb.tenant_code like CONCAT('%', #{keyword}::text,'%')
</if>
<if test="keyword !=null and keyword != '' ">
and ote.tenant_code like CONCAT('%', #{keyword}::text,'%')
</if>
<if test="keyword !=null and keyword != '' ">
and otb.tenant_name like CONCAT('%', #{keyword}::text,'%')
</if>
<if test="list!=null">
and otb.tenant_unit in
<foreach collection="list" index="index" item="tenantUnit" open="(" separator="," close=")">
#{tenantUnit}
</foreach>
</if>
</where>
limit #{pageNum} offset #{pageSize}
</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