Merge remote-tracking branch 'origin/master'

czt

2025-09-25 cbaff53b2c82cfaa7ad8cb22f5a33a1b7caecd7c

 src/main/java/com/fzzy/api/view/pr/Api1201PR.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.Api1201;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -160,34 +162,75 @@
     */
    @Expose
    public String pushData(List<Api1201> items) {
        ResponseDto responseDto;
        String result = "";
        Api1201 d;
        String kqdm = items.get(0).getKqdm();
        ApiConfs apiConf = apiCommonService.getConf(kqdm);

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

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


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

        return pushDataSingle(items,apiService,apiConf);
    }

    /**
     * 单条数据json推送
     *
     * @param items
     * @param apiRemoteService
     * @param apiConf
     * @return
     */
    private String pushDataSingle(List<Api1201> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
        ResponseDto responseDto;
        String result = "";

        //封装参数
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1201);
        Api1201 d;
        for (Api1201 data : items) {
            d = new Api1201();
            BeanUtils.copyProperties(data, d);
            responseDto = apiService.pushData(param, apiConf, d);
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, apiConf, d);

            result += responseDto.toString();
            if (responseDto.getSuccess() == 0) {
                if ("i".equals(d.getCzbz())) {
                    apiRepository.updateStatus(d.getHth(), Constant.CZBZ_U);
                if (Constant.CZBZ_I.equals(d.getCzbz())) {
                    apiRepository.updateStatus(data.getHth(), Constant.CZBZ_U);
                }
            }
        }
        return result;
    }

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

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

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

}