优化上海接口-手动上传时根据协议区分数据是否为集合形式

YYC

2023-09-18 7d6d02e3d501a0a5f5cbdff16bf594c77f2fc7cd

 src/main/java/com/fzzy/api/view/pr/Api1204PR.java

@@ -4,6 +4,8 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.Api1204;
import com.fzzy.api.entity.Api1204;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
@@ -170,18 +172,34 @@

        if (null == apiConf) return "系统没有获取到当前库区配置信息，执行失败";

        //封装参数
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1204);


        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
        if (null == apiService) return "系统没有当前推送协议配置，执行失败";

        if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
            return pushDataList(items, apiService, apiConf);
        }
        return pushDataSingle(items, apiService, apiConf);
    }
    /**
     * 单条数据json推送
     *
     * @param items
     * @param apiRemoteService
     * @param apiConf
     * @return
     */
    private String pushDataSingle(List<Api1204> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
        ResponseDto responseDto;
        String result = "";

        //封装参数
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1204);
        Api1204 d;
        for (Api1204 data : items) {
            d = new Api1204();
            BeanUtils.copyProperties(data, d);
            responseDto = apiService.pushData(param, apiConf, d);
            responseDto = apiRemoteService.pushData(param, apiConf, d);
            result += responseDto.toString();
            if (responseDto.getSuccess() == 0) {
                //todo 代表上传成功 ,后期需要保存日志
@@ -193,4 +211,31 @@
        return result;
    }

    /**
     * 多条数据json推送
     *
     * @param items
     * @param apiRemoteService
     * @param apiConf
     * @return
     */
    private String pushDataList(List<Api1204> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {

        //封装参数
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1204);

        //推送，数据为集合形式
        ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态
            for (Api1204 data : items) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    //更新状态
                    apiRepository.updateStatus(data.getRkjsdh(), Constant.CZBZ_U);
                }
            }
        }
        return responseDto.toString();
    }

}