陕西2024版接口-测试调整

czt

2024-11-06 11af6525c78f401f8e7ca1100417adf90415586e

 src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java

@@ -10,12 +10,12 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.nx2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -68,10 +68,8 @@

    @Override
    public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
        String inteId = param.getInteId();
        String kqdm = param.getKqdm();
        //查询库区信息行政区划码
        List<Api1102> api1102List = api1102Rep.findPushData(kqdm);

        try {
            if (null == conf) {
                conf = apiCommonService.getConf(kqdm);
@@ -81,12 +79,8 @@
            ApiLog apiLog = new ApiLog();
            apiLog.setId(ContextUtil.getUUID());

            //若为财务1501、1502、1503接口，则接口编码填写1114
            if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(param.getInteId())
                    || NX2023Constant.NX_2023_API_CODE_1114_1502.equals(param.getInteId())
                    || NX2023Constant.NX_2023_API_CODE_1114_1503.equals(param.getInteId())) {
                inteId = NX2023Constant.NX_2023_API_CODE_1114;
            }
            //获取接口编码
            String inteId = this.getInteId(param.getInteId());
            apiLog.setInteId(inteId);

            if (StringUtils.isEmpty(inteId)) {
@@ -118,10 +112,9 @@
            reqData.setUid(conf.getUserName());
            //指令id
            String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
            String orderId = reqData.getId();
            OrderCommonData orderCommonData = (OrderCommonData) redisUtil.get(key);
            if (null != orderCommonData && StringUtils.isNotEmpty(orderCommonData.getOrderid())) {
                orderId = orderCommonData.getOrderid();
            String orderId = (String) redisUtil.get(key);
            if (StringUtils.isEmpty(orderId)) {
                orderId = reqData.getId();
            }
            reqData.setOrderid(orderId);

@@ -134,7 +127,7 @@
            //摘要，数据主体的MD5值
            reqData.setDigst(MyMD5Util.encrypt(jsonData));
            log.info("上报数据信息=" + JSON.toJSONString(reqData));
            Nx2023RespDto responseDto = NX2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData), conf);
            Nx2023RespDto responseDto = NX2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData));

            apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
            apiLog.setResult(responseDto.getResult());
@@ -188,43 +181,69 @@
     */
    private Object getJsonApiData(String inteId, Object data) {
        if (NX2023Constant.NX_2023_API_CODE_1101.equals(inteId)) {

            Api1101 apiData = (Api1101)data;
            Nx2023Api1101 api1101 = new Nx2023Api1101();
            BeanUtils.copyProperties(data, api1101);
            BeanUtils.copyProperties(apiData, api1101);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if (StringUtils.isEmpty(api1101.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                api1101.setTydwbm(tydwbm);
            }
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if (StringUtils.isEmpty(api1101.getSjdwtybm()) && StringUtils.isNotEmpty(apiData.getSjdwdm())) {
                String sjdwtybm = apiCommonService.getTydwbm(apiData.getDwdm());
                api1101.setSjdwtybm(sjdwtybm);
            }
            return api1101;
        }
        if (NX2023Constant.NX_2023_API_CODE_1102.equals(inteId)) {
            Api1102 apiData = (Api1102)data;
            Nx2023Api1102 api1102 = new Nx2023Api1102();
            BeanUtils.copyProperties(data, api1102);
            api1102.setLkxz("1");
            BeanUtils.copyProperties(apiData, api1102);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if (StringUtils.isEmpty(api1102.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                api1102.setTykqbm(tykqbm);
            }
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if (StringUtils.isEmpty(api1102.getTydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
                api1102.setTydwbm(tydwbm);
            }
            return api1102;
        }
        if (NX2023Constant.NX_2023_API_CODE_1103.equals(inteId)) {

            Api1103 apiData = (Api1103)data;
            Nx2023Api1103 api1103 = new Nx2023Api1103();
            BeanUtils.copyProperties(data, api1103);
            BeanUtils.copyProperties(apiData, api1103);
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if (StringUtils.isEmpty(api1103.getTykqbm())) {
                String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
                api1103.setTykqbm(tykqbm);
            }
            //校验统一编码是否为空，为空则查询库区信息进行赋值
            if (StringUtils.isEmpty(api1103.getTycfbm())) {
                String tycfbm = apiCommonService.getTycfbm(apiData.getCfdm());
                api1103.setTycfbm(tycfbm);
            }
            return api1103;
        }
        if (NX2023Constant.NX_2023_API_CODE_1104.equals(inteId)) {

            Nx2023Api1104 api1104 = new Nx2023Api1104();
            BeanUtils.copyProperties(data, api1104);
            return api1104;
        }
        if (NX2023Constant.NX_2023_API_CODE_1105.equals(inteId)) {

            Nx2023Api1105 api1105 = new Nx2023Api1105();
            BeanUtils.copyProperties(data, api1105);
            return api1105;
        }
        if (NX2023Constant.NX_2023_API_CODE_1106.equals(inteId)) {

            Nx2023Api1106 api1106 = new Nx2023Api1106();
            BeanUtils.copyProperties(data, api1106);
            return api1106;
        }
        if (NX2023Constant.NX_2023_API_CODE_1107.equals(inteId)) {

            Nx2023Api1107 api1107 = new Nx2023Api1107();
            BeanUtils.copyProperties(data, api1107);
            return api1107;
@@ -254,8 +273,9 @@
            return api1111;
        }
        if (NX2023Constant.NX_2023_API_CODE_1112.equals(inteId)) {
            Api1112 apiData = (Api1112) data;
            Nx2023Api1112 api1112 = new Nx2023Api1112();
            BeanUtils.copyProperties(data, api1112);
            BeanUtils.copyProperties(apiData, api1112);
            return api1112;
        }
        if (NX2023Constant.NX_2023_API_CODE_1113.equals(inteId)) {
@@ -264,8 +284,9 @@
            return api1113;
        }
        if (NX2023Constant.NX_2023_API_CODE_1201.equals(inteId)) {
            Api1201 apiData = (Api1201) data;
            Nx2023Api1201 api1201 = new Nx2023Api1201();
            BeanUtils.copyProperties(data, api1201);
            BeanUtils.copyProperties(apiData, api1201);
            return api1201;
        }
        if (NX2023Constant.NX_2023_API_CODE_1202.equals(inteId)) {
@@ -290,8 +311,9 @@
            return api1205;
        }
        if (NX2023Constant.NX_2023_API_CODE_1206.equals(inteId)) {
            Api1206 apiData = (Api1206) data;
            Nx2023Api1206 api1206 = new Nx2023Api1206();
            BeanUtils.copyProperties(data, api1206);
            BeanUtils.copyProperties(apiData, api1206);
            return api1206;
        }
        if (NX2023Constant.NX_2023_API_CODE_1207.equals(inteId)) {
@@ -408,6 +430,24 @@
    }

    /**
     * 获取上传的接口编码
     * @param inteId
     * @return
     */
    private String getInteId(String inteId) {
        if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(inteId)) {
            return NX2023Constant.NX_2023_API_CODE_1114;
        }
        if (NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId)) {
            return NX2023Constant.NX_2023_API_CODE_1114;
        }
        if (NX2023Constant.NX_2023_API_CODE_1114_1503.equals(inteId)) {
            return NX2023Constant.NX_2023_API_CODE_1114;
        }
        return inteId;
    }

    /**
     * 赋值最后更新时间
     * @param object
     * @return
@@ -417,7 +457,7 @@
        try {
            Field zhgxsj = object.getClass().getDeclaredField("zhgxsj");
            zhgxsj.setAccessible(true);
            zhgxsj.set(object, new Date());
            zhgxsj.set(object, DateUtils.addSeconds(new Date(), -10));
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -447,10 +487,11 @@
        NxFinanceDto nxFinanceDto = new NxFinanceDto();
        nxFinanceDto.setDwdm(api1503.getDwdm());
        nxFinanceDto.setKqdm(api1503.getKqdm());

        nxFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
        nxFinanceDto.setBbm("03");
        nxFinanceDto.setCzbz(api1503.getCzbz());
        nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
        nxFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));

        paddingData(nxFinanceDto, list, "0", "项目//t", "本期金额//t", "本年累计//t");
        paddingData(nxFinanceDto, list, "1", "一、营业收入", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
@@ -501,7 +542,7 @@
        nxFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
        nxFinanceDto.setBbm("02");
        nxFinanceDto.setCzbz(api1502.getCzbz());
        nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
        nxFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));

        paddingData(nxFinanceDto, list, "0", "项目//t", "本月数//t", "本年累计数//t");
        paddingData(nxFinanceDto, list, "1", "一、经营活动产生的现金流量：", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
@@ -554,7 +595,7 @@
        nxFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
        nxFinanceDto.setBbm("01");
        nxFinanceDto.setCzbz(api1501.getCzbz());
        nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
        nxFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));

        paddingData(nxFinanceDto, list, "0",  "资产//t", "期末余额//t", "年初余额//t");
        paddingData(nxFinanceDto, list, "1",  "流动资产：", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");