From 8ae76246e2eb899335594d2da69ae0aea61f9460 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 十月 2023 20:17:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java |   33 ++++++++++++++-------------------
 1 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
index c7dad8f..774d9ac 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
@@ -24,13 +24,12 @@
 import java.util.List;
 
 /**
- * 璐т綅淇℃伅
+ * 寤掗棿淇℃伅
  *
  * @Author:YAN
  */
 @Component
 public class WhjlApi1107PR {
-
 
     @Autowired
     private ApiCommonService apiCommonService;
@@ -41,7 +40,7 @@
 
     /**
      * 鑾峰彇鍒楄〃淇℃伅
-     * whjlApi1107PR#listData
+     * whjlApi1106PR#listData
      *
      * @return
      */
@@ -52,21 +51,21 @@
             return null;
         }
         List<WhjlApi1107> list = new ArrayList<>();
-        WhjlApi1107 whjlApi1107;
+        WhjlApi1107 whjlApi1106;
         for (ApiInfoData infoData : result) {
-            whjlApi1107 = JSONObject.parseObject(infoData.getData(), WhjlApi1107.class);
-            whjlApi1107.setKqdm(infoData.getKqdm());
-            whjlApi1107.setCzbz(infoData.getCzbz());
-            whjlApi1107.setUpdateTime(infoData.getUpdateTime());
-            whjlApi1107.setBizId(infoData.getDataId());
-            list.add(whjlApi1107);
+            whjlApi1106 = JSONObject.parseObject(infoData.getData(), WhjlApi1107.class);
+            whjlApi1106.setKqdm(infoData.getKqdm());
+            whjlApi1106.setCzbz(infoData.getCzbz());
+            whjlApi1106.setUpdateTime(infoData.getUpdateTime());
+            whjlApi1106.setBizId(infoData.getDataId());
+            list.add(whjlApi1106);
         }
         return list;
     }
 
     /**
      * 鏇存柊鎴栦慨鏀�
-     * whjlApi1107PR#saveData
+     * whjlApi1106PR#saveData
      *
      * @param data
      * @return
@@ -89,7 +88,7 @@
 
     /**
      * 鍒犻櫎
-     * whjlApi1107PR#delData
+     * whjlApi1106PR#delData
      *
      * @param data
      * @return
@@ -102,7 +101,7 @@
 
     /**
      * 涓婁紶
-     * whjlApi1107PR#pushData
+     * whjlApi1106PR#pushData
      *
      * @param items
      * @return
@@ -128,19 +127,15 @@
             return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
         }
 
-        //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
-
-
-        //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
-        ApiInfoData infoData;
         ResponseDto responseDto;
+        ApiInfoData infoData;
         for (WhjlApi1107 data : items) {
             responseDto = apiService.pushData(param, apiConf, data);
             if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
 
                     infoData = new ApiInfoData();
-                    infoData.setId(data.getBizId());
+                    infoData.setId(data.getAjbh());
                     infoData.setKqdm(data.getKqdm());
                     infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                     infoData.setInteId(WhjlConstant.API_CODE_1107);

--
Gitblit v1.9.3