From 9f5574b893f786526e003a0a1463cc179f9192b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=87=A1=E5=87=A1?= <hello@itcast.cn>
Date: Tue, 29 Mar 2022 11:07:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocp/controller/ApiBasicManagementController.java   |  9 ++-------
 src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java    | 10 ++++++++++
 src/main/resources/mapper/OcpApiGroupMapper.xml        |  3 +++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
index 3b043a2..a69f9ce 100644
--- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
+++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
@@ -209,13 +209,8 @@ public class ApiBasicManagementController {
 
     @ApiOperation("省侧-应用接入申请-的模糊查询")
     @GetMapping("/selectByCondition")
-    public ResponseVO<PageInfo<OcpApiBase>> selectByCondition(@RequestParam(required = false) String apiCode,
-                                                              @RequestParam(required = false) String apiName,
-                                                              @RequestParam(required = false) String apiCenterCode,
-                                                              @RequestParam(required = false) Integer currentPage,
-                                                              @RequestParam(required = false) Integer pageSize,
-                                                              @RequestParam(required = false) String apiGroupCode) {
-        return apiBasicManagementService.selectByCondition(apiCode, apiName, apiCenterCode, currentPage, pageSize, apiGroupCode);
+    public ResponseVO<PageInfo<OcpApiBaseVo>> selectByCondition(ApiBaseDto ApiBaseReq) {
+        return apiBasicManagementService.getBaseByGroupCode(ApiBaseReq);
 
     }
 
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 369e5a9..66f1f9b 100644
--- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
+++ b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
@@ -21,6 +21,9 @@ public class ApiBaseDto implements Serializable {
     @ApiModelProperty("服务编码")
     private String apiCode;
 
+    @ApiModelProperty("服务名称")
+    private String apiName;
+
     @ApiModelProperty("服务分类编码")
     private String apiGroupCode;
 
@@ -58,6 +61,13 @@ public class ApiBaseDto implements Serializable {
     @ApiModelProperty("每页条数")
     private Integer pageSize;
 
+    public String getApiName() {
+        return apiName;
+    }
+
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
 
     private List<String> apiGroupCodeList;
 
diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml
index 485a79d..91afbef 100644
--- a/src/main/resources/mapper/OcpApiGroupMapper.xml
+++ b/src/main/resources/mapper/OcpApiGroupMapper.xml
@@ -86,6 +86,9 @@
             <if test="apiUnit !=null and apiUnit!=''">
                 and oab.api_unit = #{apiUnit}
             </if>
+            <if test="apiName !=null and apiName!=''">
+                and oab.api_name = #{apiName}
+            </if>
             <if test="apiPromotion !=null and apiPromotion!=''">
                 and oab.api_promotion = #{apiPromotion}
             </if>
-- 
2.26.0