From caf2599a9869244ded811018811c37a2aabac3fc Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 08 一月 2025 11:29:05 +0800
Subject: [PATCH] 优化测温协议

---
 src/main/java/com/fzzy/api/view/pr/Api1501PR.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/fzzy/api/view/pr/Api1501PR.java b/src/main/java/com/fzzy/api/view/pr/Api1501PR.java
index 9ba6f05..abee848 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1501PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1501PR.java
@@ -4,6 +4,7 @@
 import com.bstek.dorado.annotation.DataResolver;
 import com.bstek.dorado.annotation.Expose;
 import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
 import com.fzzy.api.entity.Api1501;
 import com.fzzy.api.entity.ApiConfs;
 import com.fzzy.api.service.ApiCommonService;
@@ -97,22 +98,34 @@
 	 */
 	@Expose
 	public String pushData(List<Api1501> items) {
-		ResponseDto responseDto;
-		String result = "";
-		Api1501 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_1501);
-
-
 		//鑾峰彇瀹炵幇鎺ュ彛
-		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<Api1501> items, ApiRemoteService apiService, ApiConfs apiConf) {
+		ResponseDto responseDto;
+		String result = "";
+
+		//灏佽鍙傛暟
+		ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1501);
+		Api1501 d;
 		for (Api1501 data : items) {
 			d = new Api1501();
 			BeanUtils.copyProperties(data, d);
@@ -129,4 +142,32 @@
 		return result;
 	}
 
+	/**
+	 * 澶氭潯鏁版嵁json鎺ㄩ��
+	 *
+	 * @param items
+	 * @param apiRemoteService
+	 * @param apiConf
+	 * @return
+	 */
+	private String pushDataList(List<Api1501> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
+
+		//灏佽鍙傛暟
+		ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1501);
+
+		//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+		ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
+		if (responseDto.getSuccess() == 0) {
+			//鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+			for (Api1501 data : items) {
+				if (Constant.CZBZ_I.equals(data.getCzbz())) {
+					//鏇存柊鐘舵��
+					data.setCzbz(Constant.CZBZ_U);
+					api1501Rep.save(data);
+				}
+			}
+		}
+		return responseDto.toString();
+	}
+
 }

--
Gitblit v1.9.3