集成接口参数配置修改

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSysIntParamDTO.java

@@ -26,17 +26,17 @@
    /**
     * 参数key
     */
    private String paramkey;
    private String paramKey;

    /**
     * 参数value
     */
    private String paramvalue;
    private String paramValue;

    /**
     * 是否使用
     */
    private String usedflag;
    private String usedFlag;


    /***
@@ -44,14 +44,43 @@
     */
    private String usedFlagText;

    @Override
    public String toString() {
        return "DockingSysIntParamDTO{" +
            "infoOid='" + infoOid + '\'' +
            ", paramkey='" + paramkey + '\'' +
            ", paramvalue='" + paramvalue + '\'' +
            ", usedflag='" + usedflag + '\'' +
            ", usedFlagText='" + usedFlagText + '\'' +
            '}';
    public String getInfoOid() {
        return infoOid;
    }

    public void setInfoOid(String infoOid) {
        this.infoOid = infoOid;
    }

    public String getParamKey() {
        return paramKey;
    }

    public void setParamKey(String paramKey) {
        this.paramKey = paramKey;
    }

    public String getParamValue() {
        return paramValue;
    }

    public void setParamValue(String paramValue) {
        this.paramValue = paramValue;
    }

    public String getUsedFlag() {
        return usedFlag;
    }

    public void setUsedFlag(String usedFlag) {
        this.usedFlag = usedFlag;
    }

    public String getUsedFlagText() {
        return usedFlagText;
    }

    public void setUsedFlagText(String usedFlagText) {
        this.usedFlagText = usedFlagText;
    }
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java

@@ -260,27 +260,41 @@

    /**
     * 接口param列表
     * @param dockingSysIntParam 基础查询对象，包含查询条件，分页，排序等
     * @param queryObject 基础查询对象，包含查询条件，分页，排序等
     * @return 集成日志显示对象列表
     */
    @GetMapping("/gridParam")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "dockingSysIntParam")
    public R<IPage<DockingSysIntParamVO>>gridParam(DockingSysIntParam dockingSysIntParam, Query query){
        IPage<DockingSysIntParamVO> pages = dokingSysManaentService.gridParam(dockingSysIntParam,query);
    public R<IPage<DockingSysIntParamVO>>gridParam(BaseQueryObject queryObject){
        Map<String,String> condtionMap=queryObject.getConditionMap();
        Query query=new Query();
        if(CollectionUtils.isEmpty(condtionMap)){
            condtionMap=new HashMap<>();
        }
        query.setCurrent(queryObject.getPage());
        query.setSize(queryObject.getLimit());
        IPage<DockingSysIntParamVO> pages = dokingSysManaentService.gridParam(condtionMap,query);
        return R.data(pages);
    }

    /**
     * 接口param列表
     * @param dockingSysIntHeader 基础查询对象，包含查询条件，分页，排序等
     * @param queryObject 基础查询对象，包含查询条件，分页，排序等
     * @return 集成日志显示对象列表
     */
    @GetMapping("/gridHeader")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "DockingSysIntHeaderVO")
    public R<IPage<DockingSysIntHeaderVO>>gridHeader(DockingSysIntHeader dockingSysIntHeader, Query query){
        IPage<DockingSysIntHeaderVO>  pages=dokingSysManaentService.gridHeader(dockingSysIntHeader,query);
    public R<IPage<DockingSysIntHeaderVO>>gridHeader(BaseQueryObject queryObject){
        Map<String,String> condtionMap=queryObject.getConditionMap();
        Query query=new Query();
        if(CollectionUtils.isEmpty(condtionMap)){
            condtionMap=new HashMap<>();
        }
        query.setCurrent(queryObject.getPage());
        query.setSize(queryObject.getLimit());
        IPage<DockingSysIntHeaderVO>  pages=dokingSysManaentService.gridHeader(condtionMap,query);
        return R.data(pages);



 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java

@@ -35,17 +35,17 @@

    /**
     * 接口param列表
     * @param dockingSysIntParam 基础查询对象，包含查询条件，分页，排序等
     * @param condtionMap 基础查询对象，包含查询条件，分页，排序等
     * @return 集成日志显示对象列表
     */
    IPage<DockingSysIntParamVO>gridParam(DockingSysIntParam dockingSysIntParam, Query query);
    IPage<DockingSysIntParamVO>gridParam(Map<String,String> condtionMap ,  Query query);


    /**
     * 接口param列表
     * @param dockingSysIntHeader 基础查询对象，包含查询条件，分页，排序等
     * @param condtionMap 基础查询对象，包含查询条件，分页，排序等
     * @return 集成日志显示对象列表
     */
    IPage<DockingSysIntHeaderVO>gridHeader(DockingSysIntHeader dockingSysIntHeader, Query query);
    IPage<DockingSysIntHeaderVO>gridHeader(Map<String,String> condtionMap , Query query);

}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java

@@ -571,7 +571,7 @@
                    String sendurl = url + "?" + DATA_PARAM_NAME + "=" + sendString;
                    //拼接param
                    for (DockingSysIntParamDTO sysIntParamVO : sysIntParamVOList) {
                        sendurl = sendurl + "&" + sysIntParamVO.getParamkey() + "=" + sysIntParamVO.getParamvalue();
                        sendurl = sendurl + "&" + sysIntParamVO.getParamKey() + "=" + sysIntParamVO.getParamValue();
                    }
                    paramString = sendurl;
                    backString = HttpUtils.get(sendurl);
@@ -579,7 +579,7 @@
                    MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
                    if(!CollectionUtils.isEmpty(sysIntParamVOList)) {
                        for (DockingSysIntParamDTO sysIntParamVO : sysIntParamVOList) {
                            params.add(sysIntParamVO.getParamkey(), sysIntParamVO.getParamvalue());
                            params.add(sysIntParamVO.getParamKey(), sysIntParamVO.getParamValue());
                        }
                    }
                    params.add(DATA_PARAM_NAME,sendString);
@@ -609,7 +609,7 @@
            }else if (type.equals(URLTYPE_WEBSERVICE)) {//webserver请求
                MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
                for (DockingSysIntParamDTO sysIntParamVO : sysIntParamVOList) {
                    params.add(sysIntParamVO.getParamkey(), sysIntParamVO.getParamvalue());
                    params.add(sysIntParamVO.getParamKey(), sysIntParamVO.getParamValue());
                }
                paramString = sendString;
                MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java

@@ -86,18 +86,18 @@
    }

    @Override
    public IPage<DockingSysIntParamVO> gridParam(DockingSysIntParam dockingSysIntParam, Query query) {
        IPage<DockingSysIntParam> pages=dockingSysIntParamService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSysIntParam));
    public IPage<DockingSysIntParamVO> gridParam(Map<String,String> condtionMap, Query query) {
        IPage<DockingSysIntParam> pages=dockingSysIntParamService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
        return DockingSysIntParamWrapper.build().pageVO(pages);
    }
    /**
     * 接口param列表
     * @param dockingSysIntHeader 基础查询对象，包含查询条件，分页，排序等
     * @param condtionMap 基础查询对象，包含查询条件，分页，排序等
     * @return 集成日志显示对象列表
     */
    @Override
    public IPage<DockingSysIntHeaderVO> gridHeader(DockingSysIntHeader dockingSysIntHeader , Query query) {
        IPage<DockingSysIntHeader> pages = dockingSysIntHeaderService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSysIntHeader));
    public IPage<DockingSysIntHeaderVO> gridHeader(Map<String,String> condtionMap , Query query) {
        IPage<DockingSysIntHeader> pages = dockingSysIntHeaderService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
        return DockingSysIntHeaderWrapper.build().pageVO(pages);
    }
}