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/push/sh2023/SH2023PushService13.java | 173 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 84 insertions(+), 89 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
index 39c62dd..58206dc 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
@@ -9,14 +9,9 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.view.repository.*;
-import com.fzzy.otherview.sh2023.dto.ShApi1311;
-import com.fzzy.otherview.sh2023.dto.ShApi2103;
-import com.fzzy.otherview.sh2023.repository.ShApi1311Rep;
-import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.sh2023.dto.SH2023Api1311;
import com.fzzy.push.sh2023.dto.SH2023Api2103;
import lombok.extern.slf4j.Slf4j;
-import org.codehaus.jackson.JsonParser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -68,17 +63,17 @@
public void pushData(ApiParam param) {
log.info("------->>>>绮簱绠＄悊 鎺ュ彛妯″潡涓婃姤寮�濮�");
- this.pushData1301(apiRemoteService, param);
- this.pushData1302(apiRemoteService, param);
- this.pushData1303(apiRemoteService, param);
- this.pushData1304(apiRemoteService, param);
- this.pushData1305(apiRemoteService, param);
- this.pushData1306(apiRemoteService, param);
- this.pushData1307(apiRemoteService, param);
- this.pushData1308(apiRemoteService, param);
- this.pushData1309(apiRemoteService, param);
- this.pushData1310(apiRemoteService, param);
- this.pushData1311(apiRemoteService, param);
+// this.pushData1301(apiRemoteService, param);
+// this.pushData1302(apiRemoteService, param);
+// this.pushData1303(apiRemoteService, param);
+// this.pushData1304(apiRemoteService, param);
+// this.pushData1305(apiRemoteService, param);
+// this.pushData1306(apiRemoteService, param);
+// this.pushData1307(apiRemoteService, param);
+// this.pushData1308(apiRemoteService, param);
+// this.pushData1309(apiRemoteService, param);
+// this.pushData1310(apiRemoteService, param);
+// this.pushData1311(apiRemoteService, param);
log.info("------->>>>绮簱绠＄悊 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
@@ -94,12 +89,14 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瀹夊叏绠＄悊锛屼笉鎺ㄩ��-----");
return;
}
+ param.setInteCategory(Constant.API_CATEGORY_13);
param.setInteId(SH2023Constant.SH_2023_API_CODE_1301);
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- ResponseDto responseDto = apiRemoteService.pushData(param, list);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- for (Api1301 data : list) {
+
+ ResponseDto responseDto;
+ for (Api1301 data : list) {
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
data.setCzbz(Constant.CZBZ_U);
@@ -108,7 +105,6 @@
}
}
}
-
}
/**
@@ -122,12 +118,14 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌娓╂箍搴︽娴嬶紝涓嶆帹閫�-----");
return;
}
+ param.setInteCategory(Constant.API_CATEGORY_13);
param.setInteId(SH2023Constant.SH_2023_API_CODE_1302);
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- ResponseDto responseDto = apiRemoteService.pushData(param, list);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- for (Api1302 data : list) {
+
+ ResponseDto responseDto;
+ for (Api1302 data : list) {
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
data.setCzbz(Constant.CZBZ_U);
@@ -149,21 +147,21 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瀹宠櫕妫�娴嬶紝涓嶆帹閫�-----");
return;
}
+ param.setInteCategory(Constant.API_CATEGORY_13);
param.setInteId(SH2023Constant.SH_2023_API_CODE_1303);
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- ResponseDto responseDto = apiRemoteService.pushData(param, list);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- for (Api1303 data : list) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ ResponseDto responseDto;
+ for (Api1303 data : list) {
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
data.setCzbz(Constant.CZBZ_U);
//鏇存柊鐘舵��
api1303Rep.save(data);
}
}
}
-
}
/**
@@ -177,14 +175,15 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌姘斾綋妫�娴嬶紝涓嶆帹閫�-----");
return;
}
+ param.setInteCategory(Constant.API_CATEGORY_13);
param.setInteId(SH2023Constant.SH_2023_API_CODE_1304);
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- ResponseDto responseDto = apiRemoteService.pushData(param, list);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- for (Api1304 data : list) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ ResponseDto responseDto;
+ for (Api1304 data : list) {
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
data.setCzbz(Constant.CZBZ_U);
//鏇存柊鐘舵��
api1304Rep.save(data);
@@ -205,21 +204,21 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌閫氶浣滀笟锛屼笉鎺ㄩ��-----");
return;
}
+ param.setInteCategory(Constant.API_CATEGORY_13);
param.setInteId(SH2023Constant.SH_2023_API_CODE_1305);
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- ResponseDto responseDto = apiRemoteService.pushData(param, list);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- for (Api1305 data : list) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ ResponseDto responseDto;
+ for (Api1305 data : list) {
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
data.setCzbz(Constant.CZBZ_U);
//鏇存柊鐘舵��
api1305Rep.save(data);
}
}
}
-
}
/**
@@ -233,14 +232,15 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鐔忚捀浣滀笟锛屼笉鎺ㄩ��-----");
return;
}
+ param.setInteCategory(Constant.API_CATEGORY_13);
param.setInteId(SH2023Constant.SH_2023_API_CODE_1306);
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- ResponseDto responseDto = apiRemoteService.pushData(param, list);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- for (Api1306 data : list) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ ResponseDto responseDto;
+ for (Api1306 data : list) {
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
data.setCzbz(Constant.CZBZ_U);
//鏇存柊鐘舵��
api1306Rep.save(data);
@@ -260,14 +260,15 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌浠撳唴瑙嗛鍥惧儚锛屼笉鎺ㄩ��-----");
return;
}
+ param.setInteCategory(Constant.API_CATEGORY_13);
param.setInteId(SH2023Constant.SH_2023_API_CODE_1307);
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- ResponseDto responseDto = apiRemoteService.pushData(param, list);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- for (Api1307 data : list) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ ResponseDto responseDto;
+ for (Api1307 data : list) {
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
data.setCzbz(Constant.CZBZ_U);
//鏇存柊鐘舵��
api1307Rep.save(data);
@@ -304,12 +305,14 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌璐ㄦ鏁版嵁锛屼笉鎺ㄩ��-----");
return;
}
+ param.setInteCategory(Constant.API_CATEGORY_13);
param.setInteId(SH2023Constant.SH_2023_API_CODE_1310);
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- ResponseDto responseDto = apiRemoteService.pushData(param, list);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- for (Api1310 data : list) {
+
+ ResponseDto responseDto;
+ for (Api1310 data : list) {
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
data.setCzbz(Constant.CZBZ_U);
//鏇存柊鐘舵��
@@ -330,29 +333,24 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瑙嗛鐩戞帶锛屼笉鎺ㄩ��-----");
return;
}
+ param.setInteCategory(Constant.API_CATEGORY_13);
param.setInteId(SH2023Constant.SH_2023_API_CODE_1311);
SH2023Api1311 shApi1311;
- List<SH2023Api1311> list = new ArrayList<>();
+ ResponseDto responseDto;
for (ApiInfoData infoData : items) {
shApi1311 = JSONObject.parseObject(infoData.getData(), SH2023Api1311.class);
- shApi1311.setCzbz(infoData.getCzbz());
shApi1311.setZhgxsj(infoData.getUpdateTime());
- list.add(shApi1311);
- }
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- ResponseDto responseDto = apiRemoteService.pushData(param, list);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- for (ApiInfoData data : items) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
- data.setCzbz(Constant.CZBZ_U);
- apiInfoDataRep.save(data);
+ param.setBizId(infoData.getDataId());
+ responseDto = apiRemoteService.pushData(param, shApi1311);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
+ infoData.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(infoData);
}
}
}
-
}
/**
@@ -367,26 +365,23 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌绮儏璁惧閰嶇疆锛屼笉鎺ㄩ��-----");
return;
}
+ param.setInteCategory(Constant.API_CATEGORY_13);
param.setInteId(SH2023Constant.SH_2023_API_CODE_2103);
+
SH2023Api2103 shApi2103;
- List<SH2023Api2103> list = new ArrayList<>();
+ ResponseDto responseDto;
for (ApiInfoData infoData : items) {
shApi2103 = JSONObject.parseObject(infoData.getData(), SH2023Api2103.class);
shApi2103.setZhgxsj(infoData.getUpdateTime());
- list.add(shApi2103);
- }
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- ResponseDto responseDto = apiRemoteService.pushData(param, list);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- for (ApiInfoData data : items) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ param.setBizId(infoData.getDataId());
+ responseDto = apiRemoteService.pushData(param, shApi2103);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
- data.setCzbz(Constant.CZBZ_U);
- apiInfoDataRep.save(data);
+ infoData.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(infoData);
}
}
}
-
}
}
--
Gitblit v1.9.3