diff --git a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java index 459ab7459b1ce0408a11ddcad0e0c9461fbee0d4..44daecbefadeeb5d51c57d4fd002b4802fae9ef0 100644 --- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java @@ -61,6 +61,15 @@ public class ApiBaseDto implements Serializable { @ApiModelProperty("每页条数") private Integer pageSize; + @ApiModelProperty("更新开始") + private String startMTime; + + @ApiModelProperty("更新结束") + private String endMTime; + + @ApiModelProperty("分类名称") + private String apiGroupName; + private List apiGroupCodeList; @@ -167,4 +176,28 @@ public class ApiBaseDto implements Serializable { public void setApiGroupCodeList(List apiGroupCodeList) { this.apiGroupCodeList = apiGroupCodeList; } + + public String getStartMTime() { + return startMTime; + } + + public void setStartMTime(String startMTime) { + this.startMTime = startMTime; + } + + public String getEndMTime() { + return endMTime; + } + + public void setEndMTime(String endMTime) { + this.endMTime = endMTime; + } + + public String getApiGroupName() { + return apiGroupName; + } + + public void setApiGroupName(String apiGroupName) { + this.apiGroupName = apiGroupName; + } } diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml index c6e0d1139e4710e63d3ca056543dcbabe6fc1e8a..447059977c127c3654d41b31eeafde8f8c9274ce 100644 --- a/src/main/resources/mapper/OcpApiGroupMapper.xml +++ b/src/main/resources/mapper/OcpApiGroupMapper.xml @@ -73,10 +73,12 @@ 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, - oab.api_description,oab.professional_kind + oab.api_description,oab.professional_kind,oab.api_mtime,oab.api_user_name, + oab.api_group_code,oag.api_group_name from ocp_api_base oab LEFT JOIN ocp_api_extent oae on oab.api_code = oae.api_code LEFT JOIN ocp_tenant_iocn oci on oab.api_code = oci.code_no + LEFT JOIN ocp_api_group oag on oab.api_group_code = oag.api_group_code and oab.api_group_code in @@ -104,6 +106,19 @@ and oab.api_name like CONCAT('%', #{keyword}::text,'%') + + = #{startMTime} + ]]> + + + + + + and oag.api_group_name = #{apiGroupName} + order by oab.api_mtime desc