From 11af6525c78f401f8e7ca1100417adf90415586e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 06 十一月 2024 17:27:45 +0800
Subject: [PATCH] 陕西2024版接口-测试调整
---
src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java | 118 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 83 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
index 40c2faf..30e14fc 100644
--- a/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
+++ b/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);
--
Gitblit v1.9.3