武汉接口调整

czt

3 天以前 1dde554c630e2de8ac7b234e57d4f12d7190f3f9

 src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java

@@ -84,9 +84,8 @@
                return responseDto;
            }

            List<Map<String, Object>> listData = getListData(param.getInteId(), data, conf);
            log.info("接口数据信息=" + listData);
            apiLog.setData(listData.toString());
            String jsonData = getListData(param.getInteId(), data, conf);
            apiLog.setData(jsonData);
            apiLog.setKqdm(kqdm);
            apiLog.setUploadTime(new Date());

@@ -107,18 +106,23 @@
            //报文标识
            reqData.setID(orderId);
            //版本号
            reqData.setVER("1.0");
            reqData.setVER("2022");
            //单位编码：11位
            reqData.setOrgNo(conf.getUserName());
            //单位名称
            reqData.setOrgName(conf.getKqmc());
            //发起时间
            reqData.setSendTime(new Date());
            reqData.setSendTime(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
            //18位单位代码
            reqData.setDwdm(conf.getKqdm().substring(0, 18));
            //加密数据主体
            reqData.setBody(SXAESUtils.encryptByAES(conf.getPublicKey(), JSON.toJSONString(listData)));
            log.debug("上报数据信息=" + JSON.toJSONString(reqData));
            reqData.setBody(jsonData);
            log.info("上报数据信息-加密前=" + JSON.toJSONString(reqData));

            reqData.setBody(SXAESUtils.encryptByAES(conf.getPublicKey(), jsonData));
            log.info("上报数据信息-加密后=" + JSON.toJSONString(reqData));

            reqData.setBody(SXAESUtils.encryptByAES(conf.getPublicKey(), jsonData));
            String resp = SX2023HttpClientUtil.postPushData(conf.getApiUrl(), JSON.toJSONString(reqData));
            if (StringUtils.isEmpty(resp)) {
                log.error("数据上传陕西省平台失败，数据={}", reqData);
@@ -128,8 +132,8 @@
                apiLogRep.save(apiLog);
                return responseDto;
            }
            resp = SXAESUtils.decryptByAES(conf.getPassword(), resp);
            SX2023RespDto sx2023RespDto = JSONObject.parseObject(JSONObject.toJSONString(resp), SX2023RespDto.class);

            SX2023RespDto sx2023RespDto = JSONObject.parseObject(resp, SX2023RespDto.class);

            if (null == sx2023RespDto || null == sx2023RespDto.getMsgBody()) {
                log.error("数据上传陕西省平台失败，数据={}", reqData);
@@ -176,14 +180,14 @@
     * @param conf
     * @return
     */
    private List<Map<String, Object>> getListData(String inteId, Object data, ApiConfs conf) {
    private String getListData(String inteId, Object data, ApiConfs conf) {
        List<Map<String, Object>> result = new ArrayList<>();
        Map<String, Object> map = new HashMap<>();
        String inteIdUrl = getInteId(inteId);
        //若为财务1501、1502、1503接口，则接口编码填写1114
        if (Constant.API_CODE_1114_1501.equals(inteId)
                || Constant.API_CODE_1114_1502.equals(inteId)
                || Constant.API_CODE_1114_1503.equals(inteId)) {
        if (Constant.API_CODE_1501.equals(inteId)
                || Constant.API_CODE_1502.equals(inteId)
                || Constant.API_CODE_1503.equals(inteId)) {
            List<SXFinanceDto> list = getFinanceData(inteId, data);
            map.put(inteIdUrl, list);
        } else {
@@ -197,7 +201,7 @@
            map.put(inteIdUrl, list);
        }
        result.add(map);
        return result;
        return JSON.toJSONString(result);
    }

    /**
@@ -251,8 +255,12 @@
            return apiData;
        }
        if (Constant.API_CODE_1109.equals(inteId)) {
            Api1109 api1109 = (Api1109) data;
            SX2023Api1109 apiData = new SX2023Api1109();
            BeanUtils.copyProperties(data, apiData);
            BeanUtils.copyProperties(api1109, apiData);

            //设置文件流
            apiData.setWjl(FileUtils.fileToByteString(api1109.getWjdz()));
            return apiData;
        }
        if (Constant.API_CODE_1110.equals(inteId)) {
@@ -306,58 +314,98 @@
            return apiData;
        }
        if (Constant.API_CODE_1208.equals(inteId)) {
            return null;
            SX2023Api1208 apiData = new SX2023Api1208();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1209.equals(inteId)) {
            return null;
            SX2023Api1209 apiData = new SX2023Api1209();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1210.equals(inteId)) {
            return null;
            SX2023Api1210 apiData = new SX2023Api1210();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1211.equals(inteId)) {
            return null;
            SX2023Api1211 apiData = new SX2023Api1211();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1212.equals(inteId)) {
            return null;
            SX2023Api1212 apiData = new SX2023Api1212();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1301.equals(inteId)) {
            return null;
            SX2023Api1301 apiData = new SX2023Api1301();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1302.equals(inteId)) {
            return null;
            SX2023Api1302 apiData = new SX2023Api1302();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1303.equals(inteId)) {
            return null;
            SX2023Api1303 apiData = new SX2023Api1303();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1304.equals(inteId)) {
            return null;
            SX2023Api1304 apiData = new SX2023Api1304();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1305.equals(inteId)) {
            return null;
            SX2023Api1305 apiData = new SX2023Api1305();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1306.equals(inteId)) {
            return null;
            SX2023Api1306 apiData = new SX2023Api1306();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1307.equals(inteId)) {
            return null;
            Api1307 api1307 = (Api1307) data;
            SX2023Api1307 apiData = new SX2023Api1307();
            BeanUtils.copyProperties(api1307, apiData);

            //设置文件流
            apiData.setCntxwjl(FileUtils.fileToByteString(api1307.getWjdz()));
            return apiData;
        }
        if (Constant.API_CODE_1308.equals(inteId)) {
            return null;
            SX2023Api1308 apiData = new SX2023Api1308();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1309.equals(inteId)) {
            return null;
            SX2023Api1309 apiData = new SX2023Api1309();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1310.equals(inteId)) {
            return null;
            SX2023Api1310 apiData = new SX2023Api1310();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1401.equals(inteId)) {
            return null;
            SX2023Api1401 apiData = new SX2023Api1401();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1403.equals(inteId)) {
            return null;
            SX2023Api1403 apiData = new SX2023Api1403();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        if (Constant.API_CODE_1404.equals(inteId)) {
            return null;
            SX2023Api1404 apiData = new SX2023Api1404();
            BeanUtils.copyProperties(data, apiData);
            return apiData;
        }
        return data;
    }
@@ -389,9 +437,9 @@
     */
    private List<SXFinanceDto> getFinanceData(String inteId, Object data) {
        //财务报表数据封装
        if (Constant.API_CODE_1114_1501.equals(inteId)) {
        if (Constant.API_CODE_1501.equals(inteId)) {
            return copyApi1501((Api1501) data);
        } else if (Constant.API_CODE_1114_1502.equals(inteId)) {
        } else if (Constant.API_CODE_1502.equals(inteId)) {
            return copyApi1502((Api1502) data);
        } else {
            return copyApi1503((Api1503) data);