Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/base/module/InterfaceDO.java

@@ -26,8 +26,13 @@ public class InterfaceDO extends UuidIdentityEntity {
    private Integer status;//状态（1生效中，0已失效）
    private String remark;//接口说明
    private String url;//https请求地址
    private String requestDemo;//请求示例
    private String responseDemo;//响应示例
    private String errorDemo;//异常示例
    private List<InterfaceParamDO> entryParams;//入参
    private List<InterfaceParamDO> commonEntryParams;//公共入参
    private List<InterfaceParamDO> commonOutParams;//公共出参
    private List<InterfaceParamDO> outParams;//出参
    private List<InterfaceErrorCodeDO> errorCodes;//错误说明
@@ -121,6 +126,33 @@ public class InterfaceDO extends UuidIdentityEntity {
        this.url = url;
    }
    @Column(name = "request_demo")
    public String getRequestDemo() {
        return requestDemo;
    }
    public void setRequestDemo(String requestDemo) {
        this.requestDemo = requestDemo;
    }
    @Column(name = "response_demo")
    public String getResponseDemo() {
        return responseDemo;
    }
    public void setResponseDemo(String responseDemo) {
        this.responseDemo = responseDemo;
    }
    @Column(name = "error_demo")
    public String getErrorDemo() {
        return errorDemo;
    }
    public void setErrorDemo(String errorDemo) {
        this.errorDemo = errorDemo;
    }
    @Transient
    public List<InterfaceParamDO> getEntryParams() {
        return entryParams;
@@ -147,4 +179,22 @@ public class InterfaceDO extends UuidIdentityEntity {
    public void setErrorCodes(List<InterfaceErrorCodeDO> errorCodes) {
        this.errorCodes = errorCodes;
    }
    @Transient
    public List<InterfaceParamDO> getCommonEntryParams() {
        return commonEntryParams;
    }
    public void setCommonEntryParams(List<InterfaceParamDO> commonEntryParams) {
        this.commonEntryParams = commonEntryParams;
    }
    @Transient
    public List<InterfaceParamDO> getCommonOutParams() {
        return commonOutParams;
    }
    public void setCommonOutParams(List<InterfaceParamDO> commonOutParams) {
        this.commonOutParams = commonOutParams;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/module/InterfaceParamDO.java

@@ -45,12 +45,44 @@ public class InterfaceParamDO extends UuidIdentityEntity {
        }
    }
    /**
     * 是否公共
     */
    public enum Common{
        yes("是",1),
        no("否",0);
        private String name;
        private Integer value;
        Common(String name, Integer value) {
            this.name = name;
            this.value = value;
        }
        public String getName() {
            return name;
        }
        public void setName(String name) {
            this.name = name;
        }
        public Integer getValue() {
            return value;
        }
        public void setValue(Integer value) {
            this.value = value;
        }
    }
    private String interfaceId;//接口id
    private String name;//参数名
    private Integer paramType;//参数类型
    private Integer dataType;//数据类型
    private String paramType;//参数类型
    private String dataType;//数据类型
    private Integer isRequire;//是否必填(1是，0否)
    private Integer maxLength;//最大长度
    private Integer common;//是否公共（1是，0不是）
    private String description;//描述
    private String example;//示例
    private Integer type;//类型（1入参，2出参）
@@ -76,20 +108,20 @@ public class InterfaceParamDO extends UuidIdentityEntity {
    }
    @Column(name = "param_type")
    public Integer getParamType() {
    public String getParamType() {
        return paramType;
    }
    public void setParamType(Integer paramType) {
    public void setParamType(String paramType) {
        this.paramType = paramType;
    }
    @Column(name = "data_type")
    public Integer getDataType() {
    public String getDataType() {
        return dataType;
    }
    public void setDataType(Integer dataType) {
    public void setDataType(String dataType) {
        this.dataType = dataType;
    }
@@ -155,4 +187,13 @@ public class InterfaceParamDO extends UuidIdentityEntity {
    public void setDel(Integer del) {
        this.del = del;
    }
    @Column(name = "common")
    public Integer getCommon() {
        return common;
    }
    public void setCommon(Integer common) {
        this.common = common;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/module/SaasInterfaceDO.java

@@ -28,8 +28,13 @@ public class SaasInterfaceDO extends UuidIdentityEntity {
    private Integer status;//状态（1启用中，0已暂停）
    private String remark;//接口说明
    private String url;//https请求地址
    private String requestDemo;//请求示例
    private String responseDemo;//响应示例
    private String errorDemo;//异常示例
    private List<SaasInterfaceParamDO> commonEntryParams;//公共入参
    private List<SaasInterfaceParamDO> entryParams;//入参
    private List<SaasInterfaceParamDO> commonOutParams;//公共出参
    private List<SaasInterfaceParamDO> outParams;//出参
    private List<SaasInterfaceErrorCodeDO> errorCodes;//错误说明
@@ -167,4 +172,49 @@ public class SaasInterfaceDO extends UuidIdentityEntity {
    public void setErrorCodes(List<SaasInterfaceErrorCodeDO> errorCodes) {
        this.errorCodes = errorCodes;
    }
    @Transient
    public List<SaasInterfaceParamDO> getCommonEntryParams() {
        return commonEntryParams;
    }
    public void setCommonEntryParams(List<SaasInterfaceParamDO> commonEntryParams) {
        this.commonEntryParams = commonEntryParams;
    }
    @Transient
    public List<SaasInterfaceParamDO> getCommonOutParams() {
        return commonOutParams;
    }
    public void setCommonOutParams(List<SaasInterfaceParamDO> commonOutParams) {
        this.commonOutParams = commonOutParams;
    }
    @Column(name = "request_demo")
    public String getRequestDemo() {
        return requestDemo;
    }
    public void setRequestDemo(String requestDemo) {
        this.requestDemo = requestDemo;
    }
    @Column(name = "response_demo")
    public String getResponseDemo() {
        return responseDemo;
    }
    public void setResponseDemo(String responseDemo) {
        this.responseDemo = responseDemo;
    }
    @Column(name = "error_demo")
    public String getErrorDemo() {
        return errorDemo;
    }
    public void setErrorDemo(String errorDemo) {
        this.errorDemo = errorDemo;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/module/SaasInterfaceParamDO.java

@@ -17,10 +17,11 @@ public class SaasInterfaceParamDO extends UuidIdentityEntity {
    private String saasId;//saas_id
    private String saasInterfaceId;//接口id
    private String name;//参数名
    private Integer paramType;//参数类型
    private Integer dataType;//数据类型
    private String paramType;//参数类型
    private String dataType;//数据类型
    private Integer isRequire;//是否必填(1是，0否)
    private Integer maxLength;//最大长度
    private Integer common;//是否公共（1是，0不是）
    private String description;//描述
    private String example;//示例
    private Integer type;//类型（1入参，2出参）
@@ -55,20 +56,20 @@ public class SaasInterfaceParamDO extends UuidIdentityEntity {
    }
    @Column(name = "param_type")
    public Integer getParamType() {
    public String getParamType() {
        return paramType;
    }
    public void setParamType(Integer paramType) {
    public void setParamType(String paramType) {
        this.paramType = paramType;
    }
    @Column(name = "data_type")
    public Integer getDataType() {
    public String getDataType() {
        return dataType;
    }
    public void setDataType(Integer dataType) {
    public void setDataType(String dataType) {
        this.dataType = dataType;
    }
@@ -134,4 +135,13 @@ public class SaasInterfaceParamDO extends UuidIdentityEntity {
    public void setDel(Integer del) {
        this.del = del;
    }
    @Column(name = "common")
    public Integer getCommon() {
        return common;
    }
    public void setCommon(Integer common) {
        this.common = common;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/module/InterfaceParamVO.java

@@ -15,13 +15,15 @@ public class InterfaceParamVO extends UuidIdentityVO {
    @ApiModelProperty(value = "参数名", example = "user")
    private String name;
    @ApiModelProperty(value = "参数类型", example = "HEADER")
    private Integer paramType;
    private String paramType;
    @ApiModelProperty(value = "数据类型", example = "VERCHAR")
    private Integer dataType;
    private String dataType;
    @ApiModelProperty(value = "是否必填(1是，0否)", example = "1")
    private Integer isRequire;
    @ApiModelProperty(value = "最大长度", example = "1")
    private Integer maxLength;
    @ApiModelProperty(value = "是否公共（1是，0不是）", example = "1")
    private Integer common;
    @ApiModelProperty(value = "描述", example = "")
    private String description;
    @ApiModelProperty(value = "示例", example = "")
@@ -49,19 +51,19 @@ public class InterfaceParamVO extends UuidIdentityVO {
        this.name = name;
    }
    public Integer getParamType() {
    public String getParamType() {
        return paramType;
    }
    public void setParamType(Integer paramType) {
    public void setParamType(String paramType) {
        this.paramType = paramType;
    }
    public Integer getDataType() {
    public String getDataType() {
        return dataType;
    }
    public void setDataType(Integer dataType) {
    public void setDataType(String dataType) {
        this.dataType = dataType;
    }
@@ -120,4 +122,12 @@ public class InterfaceParamVO extends UuidIdentityVO {
    public void setDel(Integer del) {
        this.del = del;
    }
    public Integer getCommon() {
        return common;
    }
    public void setCommon(Integer common) {
        this.common = common;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/module/InterfaceVO.java

@@ -32,11 +32,21 @@ public class InterfaceVO extends UuidIdentityVO {
    private String remark;
    @ApiModelProperty(value = "https请求地址", example = "")
    private String url;
    @ApiModelProperty(value = "请求示例", example = "")
    private String requestDemo;
    @ApiModelProperty(value = "响应示例", example = "")
    private String responseDemo;
    @ApiModelProperty(value = "异常示例", example = "")
    private String errorDemo;
    @ApiModelProperty(value = "入参", example = "")
    private List<InterfaceParamVO> entryParams;
    @ApiModelProperty(value = "出参", example = "")
    private List<InterfaceParamVO> outParams;
    @ApiModelProperty(value = "公共入参", example = "")
    private List<InterfaceParamVO> commonEntryParams;
    @ApiModelProperty(value = "公共出参", example = "")
    private List<InterfaceParamVO> commonOutParams;
    @ApiModelProperty(value = "错误说明", example = "")
    private List<InterfaceErrorCodeVO> errorCodes;
@@ -143,4 +153,44 @@ public class InterfaceVO extends UuidIdentityVO {
    public void setErrorCodes(List<InterfaceErrorCodeVO> errorCodes) {
        this.errorCodes = errorCodes;
    }
    public List<InterfaceParamVO> getCommonEntryParams() {
        return commonEntryParams;
    }
    public void setCommonEntryParams(List<InterfaceParamVO> commonEntryParams) {
        this.commonEntryParams = commonEntryParams;
    }
    public List<InterfaceParamVO> getCommonOutParams() {
        return commonOutParams;
    }
    public void setCommonOutParams(List<InterfaceParamVO> commonOutParams) {
        this.commonOutParams = commonOutParams;
    }
    public String getRequestDemo() {
        return requestDemo;
    }
    public void setRequestDemo(String requestDemo) {
        this.requestDemo = requestDemo;
    }
    public String getResponseDemo() {
        return responseDemo;
    }
    public void setResponseDemo(String responseDemo) {
        this.responseDemo = responseDemo;
    }
    public String getErrorDemo() {
        return errorDemo;
    }
    public void setErrorDemo(String errorDemo) {
        this.errorDemo = errorDemo;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/module/SaasInterfaceParamVO.java

@@ -18,13 +18,15 @@ public class SaasInterfaceParamVO extends UuidIdentityVO {
    @ApiModelProperty(value = "参数名", example = "user")
    private String name;
    @ApiModelProperty(value = "参数类型", example = "HEADER")
    private Integer paramType;
    private String paramType;
    @ApiModelProperty(value = "数据类型", example = "VERCHAR")
    private Integer dataType;
    private String dataType;
    @ApiModelProperty(value = "是否必填(1是，0否)", example = "1")
    private Integer isRequire;
    @ApiModelProperty(value = "最大长度", example = "1")
    private Integer maxLength;
    @ApiModelProperty(value = "是否公共（1是，0不是）", example = "1")
    private Integer common;
    @ApiModelProperty(value = "描述", example = "")
    private String description;
    @ApiModelProperty(value = "示例", example = "")
@@ -60,19 +62,19 @@ public class SaasInterfaceParamVO extends UuidIdentityVO {
        this.name = name;
    }
    public Integer getParamType() {
    public String getParamType() {
        return paramType;
    }
    public void setParamType(Integer paramType) {
    public void setParamType(String paramType) {
        this.paramType = paramType;
    }
    public Integer getDataType() {
    public String getDataType() {
        return dataType;
    }
    public void setDataType(Integer dataType) {
    public void setDataType(String dataType) {
        this.dataType = dataType;
    }
@@ -131,4 +133,12 @@ public class SaasInterfaceParamVO extends UuidIdentityVO {
    public void setDel(Integer del) {
        this.del = del;
    }
    public Integer getCommon() {
        return common;
    }
    public void setCommon(Integer common) {
        this.common = common;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/module/SaasInterfaceVO.java

@@ -37,7 +37,17 @@ public class SaasInterfaceVO extends UuidIdentityVO {
    private String remark;
    @ApiModelProperty(value = "https请求地址", example = "")
    private String url;
    @ApiModelProperty(value = "请求示例", example = "")
    private String requestDemo;
    @ApiModelProperty(value = "响应示例", example = "")
    private String responseDemo;
    @ApiModelProperty(value = "异常示例", example = "")
    private String errorDemo;
    @ApiModelProperty(value = "公共入参", example = "")
    private List<SaasInterfaceParamVO> commonEntryParams;
    @ApiModelProperty(value = "公共出参", example = "")
    private List<SaasInterfaceParamVO> commonOutParams;
    @ApiModelProperty(value = "入参", example = "")
    private List<SaasInterfaceParamVO> entryParams;
    @ApiModelProperty(value = "出参", example = "")
@@ -164,4 +174,44 @@ public class SaasInterfaceVO extends UuidIdentityVO {
    public void setErrorCodes(List<SaasInterfaceErrorCodeVO> errorCodes) {
        this.errorCodes = errorCodes;
    }
    public List<SaasInterfaceParamVO> getCommonEntryParams() {
        return commonEntryParams;
    }
    public void setCommonEntryParams(List<SaasInterfaceParamVO> commonEntryParams) {
        this.commonEntryParams = commonEntryParams;
    }
    public List<SaasInterfaceParamVO> getCommonOutParams() {
        return commonOutParams;
    }
    public void setCommonOutParams(List<SaasInterfaceParamVO> commonOutParams) {
        this.commonOutParams = commonOutParams;
    }
    public String getRequestDemo() {
        return requestDemo;
    }
    public void setRequestDemo(String requestDemo) {
        this.requestDemo = requestDemo;
    }
    public String getResponseDemo() {
        return responseDemo;
    }
    public void setResponseDemo(String responseDemo) {
        this.responseDemo = responseDemo;
    }
    public String getErrorDemo() {
        return errorDemo;
    }
    public void setErrorDemo(String errorDemo) {
        this.errorDemo = errorDemo;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/module/InterfaceEndpoint.java

@@ -15,7 +15,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -34,7 +33,7 @@ public class InterfaceEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private ErrorCodeUtil errorCodeUtil;
    @PostMapping(value = BaseRequestMapping.Interface.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Interface.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<InterfaceVO> create (
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
@@ -75,7 +74,7 @@ public class InterfaceEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.Interface.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Interface.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<InterfaceVO> update (
            @ApiParam(name = "jsonData", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/module/SaasInterfaceEndpoint.java

@@ -15,7 +15,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -34,7 +33,7 @@ public class SaasInterfaceEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private ErrorCodeUtil errorCodeUtil;
    @PostMapping(value = BaseRequestMapping.SaasInterface.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.SaasInterface.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<SaasInterfaceVO> create (
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
@@ -75,7 +74,7 @@ public class SaasInterfaceEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.SaasInterface.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.SaasInterface.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<SaasInterfaceVO> update (
            @ApiParam(name = "jsonData", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/service/module/InterfaceService.java

@@ -44,16 +44,28 @@ public class InterfaceService extends BaseJpaService<InterfaceDO, InterfaceDao>
        List<InterfaceParamDO> paramDOList = interfaceParamDao.findByInterfaceId(id);
        List<InterfaceParamDO> entryParams = paramDOList.stream()
                .filter(interfaceParamDO -> InterfaceParamDO.Type.entry.getValue().equals(interfaceParamDO.getType()))
                .filter(interfaceParamDO -> (InterfaceParamDO.Type.entry.getValue().equals(interfaceParamDO.getType()))
                &&InterfaceParamDO.Common.no.getValue().equals(interfaceParamDO.getCommon()))
                .collect(Collectors.toList());
        List<InterfaceParamDO> commonEntryParams = paramDOList.stream()
                .filter(interfaceParamDO -> (InterfaceParamDO.Type.entry.getValue().equals(interfaceParamDO.getType()))
                        &&InterfaceParamDO.Common.yes.getValue().equals(interfaceParamDO.getCommon()))
                .collect(Collectors.toList());
        List<InterfaceParamDO> outParams = paramDOList.stream()
                .filter(interfaceParamDO -> InterfaceParamDO.Type.out.getValue().equals(interfaceParamDO.getType()))
                .filter(interfaceParamDO -> (InterfaceParamDO.Type.out.getValue().equals(interfaceParamDO.getType()))
                        &&InterfaceParamDO.Common.no.getValue().equals(interfaceParamDO.getCommon()))
                .collect(Collectors.toList());
        List<InterfaceParamDO> commonOutParams = paramDOList.stream()
                .filter(interfaceParamDO -> (InterfaceParamDO.Type.out.getValue().equals(interfaceParamDO.getType()))
                        &&InterfaceParamDO.Common.yes.getValue().equals(interfaceParamDO.getCommon()))
                .collect(Collectors.toList());
        List<InterfaceErrorCodeDO> errorCodeDOList = interfaceErrorCodeDao.findByInterfaceId(id);
        interfaceDO.setErrorCodes(errorCodeDOList);
        interfaceDO.setEntryParams(entryParams);
        interfaceDO.setOutParams(outParams);
        interfaceDO.setCommonEntryParams(commonEntryParams);
        interfaceDO.setCommonOutParams(commonOutParams);
        return interfaceDO;
    }
@@ -81,19 +93,41 @@ public class InterfaceService extends BaseJpaService<InterfaceDO, InterfaceDao>
        List<InterfaceParamDO> entryParams = interfaceDO.getEntryParams();
        List<InterfaceParamDO> outParams = interfaceDO.getOutParams();
        List<InterfaceParamDO> commonEntryParams = interfaceDO.getCommonEntryParams();
        List<InterfaceParamDO> commonOutParams = interfaceDO.getCommonOutParams();
        List<InterfaceErrorCodeDO> errorCodes = interfaceDO.getErrorCodes();
        interfaceDao.save(interfaceDO);
        entryParams.forEach(interfaceParamDO -> {
            interfaceParamDO.setInterfaceId(interfaceDO.getId());
            interfaceParamDO.setCommon(0);
            interfaceParamDO.setDel(1);
            interfaceParamDO.setType(InterfaceParamDO.Type.entry.getValue());
        });
        outParams.forEach(interfaceParamDO -> {
            interfaceParamDO.setInterfaceId(interfaceDO.getId());
            interfaceParamDO.setCommon(0);
            interfaceParamDO.setDel(1);
            interfaceParamDO.setType(InterfaceParamDO.Type.out.getValue());
        });
        commonEntryParams.forEach(interfaceParamDO -> {
            interfaceParamDO.setInterfaceId(interfaceDO.getId());
            interfaceParamDO.setCommon(1);
            interfaceParamDO.setDel(1);
            interfaceParamDO.setType(InterfaceParamDO.Type.entry.getValue());
        });
        commonOutParams.forEach(interfaceParamDO -> {
            interfaceParamDO.setInterfaceId(interfaceDO.getId());
            interfaceParamDO.setCommon(1);
            interfaceParamDO.setDel(1);
            interfaceParamDO.setType(InterfaceParamDO.Type.out.getValue());
        });
        errorCodes.forEach(interfaceErrorCodeDO -> {
            interfaceErrorCodeDO.setInterfaceId(interfaceDO.getId());
        });
        interfaceParamDao.save(entryParams);
        interfaceParamDao.save(outParams);
        interfaceParamDao.save(commonEntryParams);
        interfaceParamDao.save(commonOutParams);
        interfaceErrorCodeDao.save(errorCodes);
        //为租户新增接口
@@ -117,6 +151,8 @@ public class InterfaceService extends BaseJpaService<InterfaceDO, InterfaceDao>
                List<SaasInterfaceParamDO> saasEntryParams = new ArrayList<>(16);
                List<SaasInterfaceParamDO> saasOutParams = new ArrayList<>(16);
                List<SaasInterfaceParamDO> saasCommonEntryParams = new ArrayList<>(16);
                List<SaasInterfaceParamDO> saasCommonOutParams = new ArrayList<>(16);
                List<SaasInterfaceErrorCodeDO> saasErrorCodes = new ArrayList<>(16);
                saasInterfaceDao.save(saasInterfaceDO);
                entryParams.forEach(interfaceParamDO -> {
@@ -127,6 +163,14 @@ public class InterfaceService extends BaseJpaService<InterfaceDO, InterfaceDao>
                    SaasInterfaceParamDO saasInterfaceParamDO = addSaasInterfaceParamDO(saasInterfaceDO,interfaceParamDO);
                    saasOutParams.add(saasInterfaceParamDO);
                });
                commonEntryParams.forEach(interfaceParamDO -> {
                    SaasInterfaceParamDO saasInterfaceParamDO = addSaasInterfaceParamDO(saasInterfaceDO,interfaceParamDO);
                    saasCommonEntryParams.add(saasInterfaceParamDO);
                });
                commonOutParams.forEach(interfaceParamDO -> {
                    SaasInterfaceParamDO saasInterfaceParamDO = addSaasInterfaceParamDO(saasInterfaceDO,interfaceParamDO);
                    saasCommonOutParams.add(saasInterfaceParamDO);
                });
                errorCodes.forEach(interfaceErrorCodeDO -> {
                    SaasInterfaceErrorCodeDO saasInterfaceErrorCodeDO = new SaasInterfaceErrorCodeDO();
                    saasInterfaceErrorCodeDO.setSort(interfaceErrorCodeDO.getSort());
@@ -139,6 +183,8 @@ public class InterfaceService extends BaseJpaService<InterfaceDO, InterfaceDao>
                    saasErrorCodes.add(saasInterfaceErrorCodeDO);
                });
                saasInterfaceParamDao.save(saasEntryParams);
                saasInterfaceParamDao.save(saasCommonEntryParams);
                saasInterfaceParamDao.save(saasCommonOutParams);
                saasInterfaceParamDao.save(saasOutParams);
                saasInterfaceErrorCodeDao.save(saasErrorCodes);
            });
@@ -158,6 +204,7 @@ public class InterfaceService extends BaseJpaService<InterfaceDO, InterfaceDao>
        saasInterfaceParamDO.setSaasId(saasInterfaceDO.getSaasId());
        saasInterfaceParamDO.setDel(interfaceParamDO.getDel());
        saasInterfaceParamDO.setName(interfaceParamDO.getName());
        saasInterfaceParamDO.setCommon(interfaceParamDO.getCommon());
        saasInterfaceParamDO.setDataType(interfaceParamDO.getDataType());
        saasInterfaceParamDO.setDescription(interfaceParamDO.getDescription());
        saasInterfaceParamDO.setExample(interfaceParamDO.getExample());

svr/svr-base/src/main/java/com/yihu/jw/base/service/module/SaasInterfaceService.java

@@ -41,19 +41,41 @@ public class SaasInterfaceService extends BaseJpaService<SaasInterfaceDO, SaasIn
        List<SaasInterfaceParamDO> entryParams = interfaceDO.getEntryParams();
        List<SaasInterfaceParamDO> outParams = interfaceDO.getOutParams();
        List<SaasInterfaceParamDO> commonEntryParams = interfaceDO.getEntryParams();
        List<SaasInterfaceParamDO> commonOutParams = interfaceDO.getOutParams();
        List<SaasInterfaceErrorCodeDO> errorCodes = interfaceDO.getErrorCodes();
        interfaceDao.save(interfaceDO);
        entryParams.forEach(interfaceParamDO -> {
            interfaceParamDO.setSaasInterfaceId(interfaceDO.getId());
            interfaceParamDO.setCommon(0);
            interfaceParamDO.setDel(1);
            interfaceParamDO.setType(InterfaceParamDO.Type.entry.getValue());
        });
        outParams.forEach(interfaceParamDO -> {
            interfaceParamDO.setSaasInterfaceId(interfaceDO.getId());
            interfaceParamDO.setCommon(0);
            interfaceParamDO.setDel(1);
            interfaceParamDO.setType(InterfaceParamDO.Type.out.getValue());
        });
        commonEntryParams.forEach(interfaceParamDO -> {
            interfaceParamDO.setSaasInterfaceId(interfaceDO.getId());
            interfaceParamDO.setCommon(1);
            interfaceParamDO.setDel(1);
            interfaceParamDO.setType(InterfaceParamDO.Type.entry.getValue());
        });
        commonOutParams.forEach(interfaceParamDO -> {
            interfaceParamDO.setSaasInterfaceId(interfaceDO.getId());
            interfaceParamDO.setCommon(1);
            interfaceParamDO.setDel(1);
            interfaceParamDO.setType(InterfaceParamDO.Type.out.getValue());
        });
        errorCodes.forEach(interfaceErrorCodeDO -> {
            interfaceErrorCodeDO.setSaasInterfaceId(interfaceDO.getId());
        });
        interfaceParamDao.save(entryParams);
        interfaceParamDao.save(outParams);
        interfaceParamDao.save(commonOutParams);
        interfaceParamDao.save(commonEntryParams);
        interfaceErrorCodeDao.save(errorCodes);
        return interfaceDO;
@@ -69,15 +91,27 @@ public class SaasInterfaceService extends BaseJpaService<SaasInterfaceDO, SaasIn
        List<SaasInterfaceParamDO> paramDOList = interfaceParamDao.findBySaasInterfaceId(id);
        List<SaasInterfaceParamDO> entryParams = paramDOList.stream()
                .filter(interfaceParamDO -> InterfaceParamDO.Type.entry.getValue().equals(interfaceParamDO.getType()))
                .filter(interfaceParamDO -> (InterfaceParamDO.Type.entry.getValue().equals(interfaceParamDO.getType()))
                        &&InterfaceParamDO.Common.no.getValue().equals(interfaceParamDO.getCommon()))
                .collect(Collectors.toList());
        List<SaasInterfaceParamDO> outParams = paramDOList.stream()
                .filter(interfaceParamDO -> InterfaceParamDO.Type.out.getValue().equals(interfaceParamDO.getType()))
                .filter(interfaceParamDO -> (InterfaceParamDO.Type.out.getValue().equals(interfaceParamDO.getType()))
                        &&InterfaceParamDO.Common.no.getValue().equals(interfaceParamDO.getCommon()))
                .collect(Collectors.toList());
        List<SaasInterfaceParamDO> commonEntryParams = paramDOList.stream()
                .filter(interfaceParamDO -> (InterfaceParamDO.Type.entry.getValue().equals(interfaceParamDO.getType()))
                        &&InterfaceParamDO.Common.yes.getValue().equals(interfaceParamDO.getCommon()))
                .collect(Collectors.toList());
        List<SaasInterfaceParamDO> commonOutParams = paramDOList.stream()
                .filter(interfaceParamDO -> (InterfaceParamDO.Type.out.getValue().equals(interfaceParamDO.getType()))
                        &&InterfaceParamDO.Common.yes.getValue().equals(interfaceParamDO.getCommon()))
                .collect(Collectors.toList());
        List<SaasInterfaceErrorCodeDO> errorCodeDOList = interfaceErrorCodeDao.findBySaasInterfaceId(id);
        interfaceDO.setErrorCodes(errorCodeDOList);
        interfaceDO.setEntryParams(entryParams);
        interfaceDO.setCommonEntryParams(commonEntryParams);
        interfaceDO.setCommonOutParams(commonOutParams);
        interfaceDO.setOutParams(outParams);
        return interfaceDO;
    }