调试上海接口，调整对应字段3

czt

2024-11-26 e35480aba8cda53d68486ce45b49b0268a901614

 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java

@@ -11,7 +11,10 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
import com.fzzy.push.nx2023.NX2023Constant;
import com.fzzy.push.sh2023.dto.*;
import com.fzzy.push.sx2024.SX2024Constant;
import com.fzzy.push.sx2024.data.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -47,6 +50,8 @@
    @Autowired
    private Api1102Rep api1102Rep;
    @Autowired
    private Api9110Rep api9110Rep;
    @Autowired
    private Api1103Rep api1103Rep;
    @Autowired
    private Api1104Rep api1104Rep;
@@ -60,6 +65,8 @@
    private Api1202Rep api1202Rep;
    @Autowired
    private Api1205Rep api1205Rep;
    @Autowired
    private Api1310Rep api1310Rep;
    @Autowired
    private Api1403Rep api1403Rep;
    @Autowired
@@ -77,10 +84,19 @@

    @Override
    public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
        String inteId = param.getInteId();

        String kqdm = param.getKqdm();
        //查询库区信息行政区划码
        List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
        String xzqhdm= "";
        if(param.getInteId().startsWith("91")){
            //查询库区信息行政区划码
            List<Api9110> api9110List = api9110Rep.findPushData(kqdm);
            xzqhdm = api9110List.get(0).getXzqhdm();
        }else {
            //查询库区信息行政区划码
            List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
            xzqhdm = api1102List.get(0).getXzqhdm();
        }

        try {
            if (null == conf) {
                conf = apiCommonService.getConf(kqdm);
@@ -89,24 +105,19 @@
            //添加日志
            ApiLog apiLog = new ApiLog();
            apiLog.setId(ContextUtil.getUUID());

            //若为财务1501、1502、1503接口，则接口编码填写1114
            if (Constant.API_CODE_1501.equals(param.getInteId())
                    || Constant.API_CODE_1502.equals(param.getInteId())
                    || Constant.API_CODE_1503.equals(param.getInteId())) {
                inteId = Constant.API_CODE_1114;
            }
            apiLog.setInteId(inteId);

            if (StringUtils.isEmpty(inteId)) {
            if (StringUtils.isEmpty(param.getInteId())) {
                ResponseDto responseDto = new ResponseDto(99, "没有获取到接口");
                apiLog.setStatus(99);
                apiLog.setResult("没有获取到接口");
                apiLogRep.save(apiLog);
                return responseDto;
            }
            apiLog.setInteId(param.getInteId());

            String jsonData = getJsonData(param.getInteId(), data, api1102List.get(0).getXzqhdm());
            //获取接口编码
            String inteId = this.getInteId(param.getInteId());
            //获取JSON报文
            String jsonData = getJsonData(param.getInteId(), data, xzqhdm);
            log.info("接口数据信息=" + jsonData);
            apiLog.setData(jsonData);
            apiLog.setKqdm(kqdm);
@@ -481,6 +492,13 @@
            if(StringUtils.isEmpty(api1201.getKhtyshxydm())){
                api1201.setGxfs("3");
            }
            //付款方式
            if(StringUtils.isEmpty(api1201.getFkfs())){
                api1201.setFkfs("4");
            }
            if(StringUtils.isEmpty(api1201.getYsfs())){
                api1201.setYsfs("按封仓数量进行验收");
            }
            //设置空属性为默认值
            changeObject(api1201);
            return api1201;
@@ -494,6 +512,11 @@
            if(StringUtils.isEmpty(api1202.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1202.getHwdm());
                api1202.setTyhwbm(tyhwbm);
            }
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1202.getLqgsdwtybm())){
                String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0,18));
                api1202.setLqgsdwtybm(tydwbm);
            }
            api1202.setJzrq(apiData.getCmsj());
            if (StringUtils.isEmpty(api1202.getCddm())) {
@@ -527,7 +550,20 @@
            }
            //粮食性质
            api1202.setLsxzdm("200");

            //售粮人信息
            if(StringUtils.isEmpty(api1202.getSlr())){
                api1202.setSlr("售粮人");
            }
            if(StringUtils.isEmpty(api1202.getSlrdz())){
                api1202.setSlrdz("售粮人地址");
            }
            //生成方式
            if(null == api1202.getScfs()){
                api1202.setScfs("1");
            }
            if(StringUtils.isEmpty(api1202.getSdblyy())){
                api1202.setSdblyy("流程生成无补录原因");
            }
            //设置空属性为默认值
            changeObject(api1202);
            return api1202;
@@ -640,7 +676,18 @@
            if (null != api1208List && api1208List.size() > 0) {
                api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
            }

            //质检单号
            List<Api1310> api1310List = api1310Rep.getDataByHwdm(api1205.getHwdm(), "02");
            if (null != api1310List && api1310List.size() > 0) {
                api1205.setZjbgdh(api1310List.get(0).getZjbgdh());
            }
            //生成方式
            if(null == api1205.getScfs()){
                api1205.setScfs("1");
            }
            if(StringUtils.isEmpty(api1205.getSdblyy())){
                api1205.setSdblyy("流程生成无补录原因");
            }
            //设置空属性为默认值
            changeObject(api1205);
            return api1205;
@@ -759,6 +806,18 @@
            //粮食性质,暂时默认区级储备
            api1209.setLsxzdm("122");

            //损益环节，默认出库损耗
            if(StringUtils.isEmpty(api1209.getSyhj())){
                api1209.setSyhj("2");
            }
            //获取上海规范损益类型
            api1209.setSylx(getShSylxByGb(api1209.getSylx()));
            //入库数量
            if(api1209.getRksl() < api1209.getRkjz()){
                api1209.setRksl(api1209.getRkjz());
            }
            api1209.setCqqrbs(apiData.getCqqrbs() + "");
            api1209.setSfch(apiData.getSfch() + "");
            //设置空属性为默认值
            changeObject(api1209);
            return api1209;
@@ -846,6 +905,17 @@
            //设置空属性为默认值
            changeObject(api1212);
            return api1212;
        }
        if (SH2023Constant.SH_2023_API_CODE_1213.equals(inteId)) {
            Api1213 api1213 = (Api1213) data;
            SH2023Api1213 apiData = new SH2023Api1213();
            BeanUtils.copyProperties(api1213, apiData);
            //设置統一货位编码
            if (StringUtils.isEmpty(apiData.getTyhwbm())) {
                String tyhwbm = apiCommonService.getTyhwbm(api1213.getHwdm());
                apiData.setTyhwbm(tyhwbm);
            }
            return apiData;
        }
        if (SH2023Constant.SH_2023_API_CODE_1301.equals(inteId)) {
            SH2023Api1301 api1301 = new SH2023Api1301();
@@ -1210,6 +1280,80 @@
            //设置空属性为默认值
            changeObject(data);
            return data;
        }
        if (Constant.API_CODE_1504.equals(inteId)) {
            Api1504 api1504 = (Api1504)data;
            SH2023Api1504 apiData = new SH2023Api1504();
            BeanUtils.copyProperties(api1504, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1505.equals(inteId)) {
            Api1505 api1505 = (Api1505)data;
            SH2023Api1505 apiData = new SH2023Api1505();
            BeanUtils.copyProperties(api1505, apiData);
            apiData.setCqunit(api1505.getCqunit() +"");
            apiData.setCyear(api1505.getCyear() +"");
            apiData.setCdc(api1505.getCdc() +"");
            apiData.setBl(api1505.getBl() +"");
            apiData.setNgrade(api1505.getNgrade() +"");
            apiData.setBq(api1505.getBq() +"");
            apiData.setCqunit(api1505.getCqunit() +"");
            apiData.setBcash(api1505.getBcash() +"");
            apiData.setBbank(api1505.getBbank() +"");
            apiData.setBxjll(api1505.getBxjll() +"");
            apiData.setBf(api1505.getBf() +"");
            return apiData;
        }
        if (Constant.API_CODE_1506.equals(inteId)) {
            Api1506 api1506 = (Api1506)data;
            SH2023Api1506 apiData = new SH2023Api1506();
            BeanUtils.copyProperties(api1506, apiData);
            apiData.setCyear(api1506.getCyear() +"");
            apiData.setNno(api1506.getNno() +"");
            apiData.setCdc(api1506.getCdc() +"");
            return apiData;
        }
        if (Constant.API_CODE_1507.equals(inteId)) {
            Api1507 api1507 = (Api1507)data;
            SH2023Api1507 apiData = new SH2023Api1507();
            BeanUtils.copyProperties(api1507, apiData);
            apiData.setCmon(api1507.getCmon() +"");
            apiData.setCyear(api1507.getCyear() +"");
            apiData.setNvno(api1507.getNvno() +"");
            apiData.setNno(api1507.getNno() +"");
            apiData.setCdc(api1507.getCdc() +"");
            apiData.setBpt(api1507.getBpt() +"");
            apiData.setNanum(api1507.getNanum() +"");
            apiData.setBtmp(api1507.getBtmp() +"");
            return apiData;
        }
        if (Constant.API_CODE_1508.equals(inteId)) {
            Api1508 api1508 = (Api1508)data;
            SH2023Api1508 apiData = new SH2023Api1508();
            BeanUtils.copyProperties(api1508, apiData);
            apiData.setCmon(api1508.getCmon() +"");
            apiData.setCyear(api1508.getCyear() +"");
            apiData.setNvno(api1508.getNvno() +"");
            apiData.setNrowno(api1508.getNrowno() +"");
            apiData.setCdc(api1508.getCdc() +"");
            return apiData;
        }
        if (Constant.API_CODE_1509.equals(inteId)) {
            Api1509 api1509 = (Api1509)data;
            SH2023Api1509 apiData = new SH2023Api1509();
            BeanUtils.copyProperties(api1509, apiData);
            apiData.setDeprmethodid(api1509.getDeprmethodid() + "");
            apiData.setSourceid(api1509.getSourceid() + "");
            apiData.setUsingperiods(api1509.getUsingperiods() + "");
            return apiData;
        }
        if (Constant.API_CODE_1510.equals(inteId)) {
            Api1510 api1510 = (Api1510)data;
            SH2023Api1510 apiData = new SH2023Api1510();
            BeanUtils.copyProperties(api1510, apiData);
            apiData.setPeriod(api1510.getPeriod() + "");
            apiData.setAcctyear(api1510.getAcctyear() + "");
            return apiData;
        }
        //设置空属性为默认值
        changeObject(data);
@@ -1652,4 +1796,117 @@
        return object;
    }

    private String getShSylxByGb(String gbSylx){
        if("1".equals(gbSylx)){
            return "2";
        }
        if("2".equals(gbSylx)){
            return "1";
        }
        return gbSylx;
    }

    /**
     * 根据接口编码获取对应的接口数据库表名
     *
     * @param inteId
     * @return
     */
    private String getInteId(String inteId) {
        //数据相符性
        if (Constant.API_CODE_9101.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_1115;
        }
        //视频监控接口
        if (Constant.API_CODE_9102.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_1311;
        }
        //倒仓倒入数据接口
        if (Constant.API_CODE_9103.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_2102;
        }
        //粮情设备配置数据接口
        if (Constant.API_CODE_9104.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_2103;
        }
        //检斤单数据接口
        if (Constant.API_CODE_9105.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_2101;
        }
        //市储驳运单信息数据接口
        if (Constant.API_CODE_9106.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_2104;
        }
        //交易中心合同信心数据接口
        if (Constant.API_CODE_9107.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_2203;
        }
        //定化水检验接口
        if (Constant.API_CODE_9108.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_2204;
        }
        //单位信息数据接口
        if (Constant.API_CODE_9109.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_3101;
        }
        //收纳库信息数据接口
        if (Constant.API_CODE_9110.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_3102;
        }
        //仓房信息数据接口
        if (Constant.API_CODE_9111.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_3103;
        }
        //廒间信息数据接口
        if (Constant.API_CODE_9112.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_3104;
        }
        //货位信息数据接口
        if (Constant.API_CODE_9113.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_3105;
        }
        //粮食入库信息数据接口
        if (Constant.API_CODE_9114.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_3201;
        }
        //来粮检验信息数据接口
        if (Constant.API_CODE_9115.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_3202;
        }
        //粮食收购基础信息数据接口
        if (Constant.API_CODE_9116.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_3203;
        }
        if (Constant.API_CODE_1501.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_1114;
        }
        if (Constant.API_CODE_1502.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_1114;
        }
        if (Constant.API_CODE_1503.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_1114;
        }
        if (Constant.API_CODE_1504.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_1116;
        }
        if (Constant.API_CODE_1505.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_1117;
        }
        if (Constant.API_CODE_1506.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_1118;
        }
        if (Constant.API_CODE_1507.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_1119;
        }
        if (Constant.API_CODE_1508.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_1120;
        }
        if (Constant.API_CODE_1509.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_1121;
        }
        if (Constant.API_CODE_1510.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_1122;
        }
        return inteId;
    }
}