From e766a73b1829f270032f246329e4fab601a57131 Mon Sep 17 00:00:00 2001
From: diaoruifeng <18351522362@163.com>
Date: Wed, 30 Mar 2022 11:21:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pms/ocp/model/vo/OcpApiBaseVo.java    | 21 ++++++++++++++++++-
 .../service/impl/ApiDetailsServiceImpl.java   | 10 +++++++--
 src/main/resources/application-local.yml      |  4 ++--
 .../resources/mapper/ApiDetailsMapper.xml     |  2 +-
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java b/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java
index bf64e18..73e0d1c 100644
--- a/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java
+++ b/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java
@@ -51,7 +51,10 @@ public class OcpApiBaseVo implements Serializable {
     private String apiUnit;
     @ApiModelProperty(value = "出参入参")
     private List<OcpApiParam> apiParams;
-
+    @ApiModelProperty(value = "出参集合")
+    private List<OcpApiParam> apiOutParams;
+    @ApiModelProperty(value = "入参集合")
+    private List<OcpApiParam> apiINParams;
     @ApiModelProperty("服务分类代码")
     private String apiGroupCode;
 
@@ -148,6 +151,22 @@ public class OcpApiBaseVo implements Serializable {
         return apiGroupCode;
     }
 
+    public List<OcpApiParam> getApiOutParams() {
+        return apiOutParams;
+    }
+
+    public void setApiOutParams(List<OcpApiParam> apiOutParams) {
+        this.apiOutParams = apiOutParams;
+    }
+
+    public List<OcpApiParam> getApiINParams() {
+        return apiINParams;
+    }
+
+    public void setApiINParams(List<OcpApiParam> apiINParams) {
+        this.apiINParams = apiINParams;
+    }
+
     public void setApiGroupCode(String apiGroupCode) {
         this.apiGroupCode = apiGroupCode;
     }
diff --git a/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java
index 1e4b14c..1f59393 100644
--- a/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java
@@ -46,8 +46,14 @@ public class ApiDetailsServiceImpl implements ApiDetailsService {
         //查询请求字段表
         QueryWrapper<OcpApiParam> wrapper = new QueryWrapper<>();
         wrapper.lambda().eq(OcpApiParam::getApiCode, apiCode);
-        List<OcpApiParam> ocpApiParams = apiParamMapper.selectList(wrapper);
-        ocpApiBase.setApiParams(ocpApiParams);
+        wrapper.lambda().eq(OcpApiParam::getApiParamClassification, "out");
+        List<OcpApiParam> ocpApiOutParams = apiParamMapper.selectList(wrapper);
+        QueryWrapper<OcpApiParam> wrappers = new QueryWrapper<>();
+        wrappers.lambda().eq(OcpApiParam::getApiCode, apiCode);
+        wrappers.lambda().eq(OcpApiParam::getApiParamClassification, "in");
+        List<OcpApiParam> ocpApiInParams = apiParamMapper.selectList(wrappers);
+        ocpApiBase.setApiOutParams(ocpApiOutParams);
+        ocpApiBase.setApiINParams(ocpApiInParams);
         return ResponseVO.ok(ocpApiBase);
     }
 
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
index c5366b2..aca07fb 100644
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@@ -2,11 +2,11 @@ spring:
   datasource:
     driver-class-name: org.postgresql.Driver
     username: postgres
-    password: 1234
+    password: 123456
     type: com.zaxxer.hikari.HikariDataSource
 #    jdbc-url: jdbc:postgresql://192.168.43.20:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
 #    jdbc-url: jdbc:postgresql://172.20.10.9:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
-    url: jdbc:postgresql://localhost:5432/pms_accept?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
+    url: jdbc:postgresql://localhost:5432/test?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
 
 knife4j:
   enable: true
diff --git a/src/main/resources/mapper/ApiDetailsMapper.xml b/src/main/resources/mapper/ApiDetailsMapper.xml
index 9a21199..582887e 100644
--- a/src/main/resources/mapper/ApiDetailsMapper.xml
+++ b/src/main/resources/mapper/ApiDetailsMapper.xml
@@ -6,7 +6,7 @@
 
         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
+        oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime,oab.api_req,oab.api_resp from ocp_api_base oab
         LEFT JOIN ocp_api_extent oae
         on oab.api_code = oae.api_code
         where oab.is_delete = 0
-- 
2.26.0