武汉接口调整

czt

3 天以前 1dde554c630e2de8ac7b234e57d4f12d7190f3f9

 src/main/java/com/fzzy/api/view/pr/Api1203PR.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.Api1203;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -83,12 +85,12 @@
                    predicates.add(predicate2);
                }
                if (null != param.getStart()) {
                    Predicate predicate3 = cb.greaterThan(root.get("ywrq"), ContextUtil.getCurZero(param.getStart()));
                    Predicate predicate3 = cb.greaterThan(root.get("jysj"), ContextUtil.getCurZero(param.getStart()));
                    predicates.add(predicate3);
                }

                if (null != param.getEnd()) {
                    Predicate predicate4 = cb.lessThan(root.get("ywrq"), ContextUtil.getNextZero(param.getEnd()));
                    Predicate predicate4 = cb.lessThan(root.get("jysj"), ContextUtil.getNextZero(param.getEnd()));
                    predicates.add(predicate4);
                }
                return cb.and(predicates.toArray(new Predicate[0]));
@@ -130,7 +132,7 @@
    @Expose
    public String delData(Api1203 data) {
        if (null == data) return "无数据执行";
        apiRepository.deleteById(data.getBizId());
        apiRepository.deleteById(data.getRkjydh());

        return null;
    }
@@ -161,26 +163,38 @@
     */
    @Expose
    public String pushData(List<Api1203> items) {
        ResponseDto responseDto;
        String result = "";
        Api1203 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_1203);


        //获取实现接口
        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<Api1203> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
        ResponseDto responseDto;
        String result = "";

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

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

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

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


}