From 5f94cc1e92d0b31905d927602d095ac3a0a3711a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 07 五月 2024 19:34:04 +0800
Subject: [PATCH] 陕西省平台提交4-接口联调
---
src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
index e63a1c0..454826d 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());
@@ -117,9 +116,13 @@
//18浣嶅崟浣嶄唬鐮�
reqData.setDwdm(conf.getKqdm().substring(0, 18));
//鍔犲瘑鏁版嵁涓讳綋
-// reqData.setBody(listData);
- reqData.setBody(SXAESUtils.encryptByAES(conf.getPublicKey(), listData.toString()));
- 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);
@@ -129,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);
@@ -177,7 +180,7 @@
* @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);
@@ -198,7 +201,7 @@
map.put(inteIdUrl, list);
}
result.add(map);
- return result;
+ return JSON.toJSONString(result);
}
/**
@@ -252,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)) {
@@ -362,8 +369,12 @@
return apiData;
}
if (Constant.API_CODE_1307.equals(inteId)) {
+ Api1307 api1307 = (Api1307) data;
SX2023Api1307 apiData = new SX2023Api1307();
- BeanUtils.copyProperties(data, apiData);
+ BeanUtils.copyProperties(api1307, apiData);
+
+ //璁剧疆鏂囦欢娴�
+ apiData.setCntxwjl(FileUtils.fileToByteString(api1307.getWjdz()));
return apiData;
}
if (Constant.API_CODE_1308.equals(inteId)) {
--
Gitblit v1.9.3