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 bf64e18a58cbffaeccf16c2dfac082023b3d3e57..73e0d1c4ea64e70143fd5defb1edd3d18ef246af 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 apiParams; - + @ApiModelProperty(value = "出参集合") + private List apiOutParams; + @ApiModelProperty(value = "入参集合") + private List apiINParams; @ApiModelProperty("服务分类代码") private String apiGroupCode; @@ -148,6 +151,22 @@ public class OcpApiBaseVo implements Serializable { return apiGroupCode; } + public List getApiOutParams() { + return apiOutParams; + } + + public void setApiOutParams(List apiOutParams) { + this.apiOutParams = apiOutParams; + } + + public List getApiINParams() { + return apiINParams; + } + + public void setApiINParams(List 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 1e4b14c39f4eef6f3fd1f3a570729b54c6ceaaa0..1f5939399428375c5c546445ca3d1e54bbcf096e 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 wrapper = new QueryWrapper<>(); wrapper.lambda().eq(OcpApiParam::getApiCode, apiCode); - List ocpApiParams = apiParamMapper.selectList(wrapper); - ocpApiBase.setApiParams(ocpApiParams); + wrapper.lambda().eq(OcpApiParam::getApiParamClassification, "out"); + List ocpApiOutParams = apiParamMapper.selectList(wrapper); + QueryWrapper wrappers = new QueryWrapper<>(); + wrappers.lambda().eq(OcpApiParam::getApiCode, apiCode); + wrappers.lambda().eq(OcpApiParam::getApiParamClassification, "in"); + List 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 c5366b2ac0dfaff3cf0eb8df3ac4ba51074d3c90..aca07fbf309261a2b90ae0ea4cafa19b30659bbe 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 9a2119933f6a8d12e0d8dad3d9ed70cf5d396f38..582887e745286e5623255385e934e695a069e8e9 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