From 0a76dacc5d525be4ce1a2dc5e12ddbe44fbddcad Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 08 一月 2024 21:24:16 +0800
Subject: [PATCH] 优化上海省平台接口
---
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index aa07138..c40bfac 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -106,9 +106,14 @@
//鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
//鑾峰彇json鏁版嵁
- String jsonData = getJsonData(inteId, data, api1102List.get(0).getXzqhdm());
+ List<Object> list = getJsonData(inteId, data, api1102List.get(0).getXzqhdm());
+ ShjdjwReqDto reqData = new ShjdjwReqDto();
+ //鎺ュ彛ID
+ reqData.setId(getInteId(inteId));
+ //涓婁紶鏁版嵁锛屽姞瀵�
+ reqData.setData(list);
- apiLog.setData(jsonData);
+ apiLog.setData(JSON.toJSONString(reqData));
apiLog.setKqdm(kqdm);
apiLog.setUploadTime(new Date());
if (conf == null) {
@@ -119,13 +124,11 @@
return responseDto;
}
- ShjdjwReqDto reqData = new ShjdjwReqDto();
- //鎺ュ彛ID
- reqData.setId(getInteId(inteId));
- //涓婁紶鏁版嵁锛屽姞瀵�
- reqData.setData(AESUtils.encryptByEcb(jsonData, conf.getPublicKey()));
+ String jsonStr = JSON.toJSONString(reqData);
+ log.info("涓婃姤鏁版嵁淇℃伅=" + jsonStr);
+ jsonStr = AESUtils.encryptByEcb(jsonStr, conf.getPublicKey());
- ShjdjwRespDto responseDto = Shjdjw2023HttpClientUtil.postPushData(conf.getApiUrl(), JSON.toJSONString(reqData), conf);
+ ShjdjwRespDto responseDto = Shjdjw2023HttpClientUtil.postPushData(conf.getApiUrl(), jsonStr, conf);
responseDto.setBizId(bizId);
apiLog.setStatus(responseDto.getCode() == 1 ? 0 : responseDto.getCode());
@@ -186,12 +189,12 @@
* @param code
* @return
*/
- private String getJsonData(String inteId, Object data, String code) {
+ private List<Object> getJsonData(String inteId, Object data, String code) {
List<Object> list = new ArrayList<>();
Object object = getJsonApiData(inteId, data, code);
list.add(object);
- return JSON.toJSONString(list);
+ return list;
}
/**
@@ -274,6 +277,7 @@
//璁剧疆绮杞崲骞村害,鏍规嵁璁″垝鏄庣粏鍙锋煡璇㈣鍒掓槑缁嗭紝鍐嶆牴鎹鍒掓槑缁嗘煡璇㈣疆鎹㈣鍒�
List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
if (null != api1404List && api1404List.size() > 0) {
+ api1202.setShnd(api1404List.get(0).getShnd());
List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
if (null != api1403List && api1403List.size() > 0) {
if (StringUtils.isNotEmpty(api1403List.get(0).getJhnd())) {
@@ -449,8 +453,8 @@
}
}
}
- api1403.setLrsl(lrsl / 1000 + "");
- api1403.setLcsl(lcsl / 1000 + "");
+ api1403.setLrsl(lrsl + "");
+ api1403.setLcsl(lcsl + "");
//璁剧疆绌哄睘鎬т负榛樿鍊�
return api1403;
--
Gitblit v1.9.3