From cbaff53b2c82cfaa7ad8cb22f5a33a1b7caecd7c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 25 九月 2025 10:06:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/api/view/pr/Api1303PR.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1303PR.java b/src/main/java/com/fzzy/api/view/pr/Api1303PR.java
index 03de6ee..962278c 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1303PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1303PR.java
@@ -4,7 +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.entity.Api1303;
+import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
@@ -158,21 +158,34 @@
*/
@Expose
public String pushData(List<Api1303> items) {
- ResponseDto responseDto;
- String result = "";
- Api1303 d;
+
String kqdm = items.get(0).getKqdm();
ApiConfs apiConf = apiCommonService.getConf(kqdm);
if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
- //灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1303);
-
-
//鑾峰彇瀹炵幇鎺ュ彛
- ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+
+ return pushDataSingle(items, apiService, apiConf);
+ }
+
+ /**
+ * 鍗曟潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataSingle(List<Api1303> items, ApiRemoteService apiService, ApiConfs apiConf) {
+ ResponseDto responseDto;
+ String result = "";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1303);
+ Api1303 d;
for (Api1303 data : items) {
d = new Api1303();
@@ -188,6 +201,35 @@
}
}
return result;
+
+ }
+
+ /**
+ * 澶氭潯鏁版嵁json鎺ㄩ��
+ *
+ * @param items
+ * @param apiRemoteService
+ * @param apiConf
+ * @return
+ */
+ private String pushDataList(List<Api1303> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, Constant.API_CODE_1303);
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1303 data : items) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ //鏇存柊鐘舵��
+ data.setCzbz(Constant.CZBZ_U);
+ api1303Rep.save(data);
+ }
+ }
+ }
+ return responseDto.toString();
}
}
--
Gitblit v1.9.3