From 2fe99f0d876377f7d20cb922c83d31cfbf766020 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 27 十二月 2023 16:33:33 +0800
Subject: [PATCH] 上海嘉定纪委接口-提交2

---
 src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 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..2652a3d 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;
     }
 
     /**

--
Gitblit v1.9.3