From f3d2007e78e8df1064ee7a3b4b9b4c790717fba7 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 22 四月 2024 16:09:33 +0800
Subject: [PATCH] 调整广东省平台市局推送-增加指令推送,测试使用

---
 src/main/java/com/fzzy/api/view/pr/Api1202PR.java |   86 +++++++++++++++++++++++++++++++-----------
 1 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/fzzy/api/view/pr/Api1202PR.java b/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
index 8d81643..bec0153 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1202PR.java
@@ -4,6 +4,7 @@
 import com.bstek.dorado.annotation.DataResolver;
 import com.bstek.dorado.annotation.Expose;
 import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.data.PushProtocol;
 import com.fzzy.api.entity.ApiConfs;
 import com.fzzy.api.service.ApiCommonService;
 import com.fzzy.api.service.ApiPushManager;
@@ -130,7 +131,7 @@
     @Expose
     public String delData(Api1202 data) {
 
-        apiRepository.deleteById(data.getId());
+        apiRepository.deleteById(data.getRkywdh());
 
         return null;
     }
@@ -160,35 +161,74 @@
      */
     @Expose
     public String pushData(List<Api1202> items) {
-            ResponseDto responseDto;
-            String result = "";
-            Api1202 d;
-            String kqdm = items.get(0).getKqdm();
-            ApiConfs apiConf = apiCommonService.getConf(kqdm);
 
-            if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+        String kqdm = items.get(0).getKqdm();
+        ApiConfs apiConf = apiCommonService.getConf(kqdm);
 
-            //灏佽鍙傛暟
-            ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1202);
+        if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
 
+        //鑾峰彇瀹炵幇鎺ュ彛
+        ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
+        if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
 
-            //鑾峰彇瀹炵幇鎺ュ彛
-            ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
-            if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+        return pushDataSingle(items, apiService, apiConf);
+    }
 
-            for (Api1202 data : items) {
-                d = new Api1202();
-                BeanUtils.copyProperties(data, d);
-                responseDto = apiService.pushData(param, apiConf, d);
-                result += responseDto.toString();
-                if (responseDto.getSuccess() == 0) {
-                    //todo 浠h〃涓婁紶鎴愬姛 ,鍚庢湡闇�瑕佷繚瀛樻棩蹇�
-                    if ("i".equals(d.getCzbz())) {
-                        apiRepository.updateStatus(d.getRkywdh(), Constant.CZBZ_U);
-                    }
+    /**
+     * 鍗曟潯鏁版嵁json鎺ㄩ��
+     *
+     * @param items
+     * @param apiRemoteService
+     * @param apiConf
+     * @return
+     */
+    private String pushDataSingle(List<Api1202> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+        ResponseDto responseDto;
+        String result = "";
+
+        //灏佽鍙傛暟
+        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1202);
+        Api1202 d;
+        for (Api1202 data : items) {
+            d = new Api1202();
+            BeanUtils.copyProperties(data, d);
+            responseDto = apiRemoteService.pushData(param, apiConf, d);
+            result += responseDto.toString();
+            if (responseDto.getSuccess() == 0) {
+                //todo 浠h〃涓婁紶鎴愬姛 ,鍚庢湡闇�瑕佷繚瀛樻棩蹇�
+                if ("i".equals(d.getCzbz())) {
+                    apiRepository.updateStatus(d.getRkywdh(), Constant.CZBZ_U);
                 }
             }
-            return result;
         }
+        return result;
+    }
+
+    /**
+     * 澶氭潯鏁版嵁json鎺ㄩ��
+     *
+     * @param items
+     * @param apiRemoteService
+     * @param apiConf
+     * @return
+     */
+    private String pushDataList(List<Api1202> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+        //灏佽鍙傛暟
+        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_12, Constant.API_CODE_1202);
+
+        //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+        ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+        if (responseDto.getSuccess() == 0) {
+            //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+            for (Api1202 data : items) {
+                if (Constant.CZBZ_I.equals(data.getCzbz())) {
+                    //鏇存柊鐘舵��
+                    apiRepository.updateStatus(data.getRkywdh(), Constant.CZBZ_U);
+                }
+            }
+        }
+        return responseDto.toString();
+    }
 
 }

--
Gitblit v1.9.3