From 6ad5ee724102a7cc115a4024c00e23b40b87072c Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期三, 20 九月 2023 17:45:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java | 324 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 274 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
index a263dc7..f9c9aef 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
@@ -9,6 +9,7 @@
import com.fzzy.api.service.PushService11;
import com.fzzy.api.view.repository.*;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -53,6 +54,12 @@
private Api1112Rep api1112Rep;
@Autowired
private Api1113Rep api1113Rep;
+ @Autowired
+ private Api1501Rep api1501Rep;
+ @Autowired
+ private Api1502Rep api1502Rep;
+ @Autowired
+ private Api1503Rep api1503Rep;
@Override
public String getProtocol() {
@@ -62,36 +69,36 @@
@Override
public void pushData(ApiParam param) {
- log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤寮�濮�");
+ log.info("------->>>>涓婃捣2023鎺ュ彛涓嶄富鍔ㄤ笂鎶�");
- //鎺ㄩ�佸崟浣嶄俊鎭�
- this.pushData1101(apiRemoteService, param);
- //搴撳尯淇℃伅
- this.pushData1102(apiRemoteService, param);
- //浠撴埧淇℃伅
- this.pushData1103(apiRemoteService, param);
- //寤掗棿淇℃伅
- this.pushData1104(apiRemoteService, param);
- //璐т綅淇℃伅
- this.pushData1105(apiRemoteService, param);
- //娌圭綈淇℃伅
- this.pushData1106(apiRemoteService, param);
- //璁惧淇℃伅
- this.pushData1107(apiRemoteService, param);
- //鑽墏淇℃伅
- this.pushData1108(apiRemoteService, param);
- //鏂囦欢淇℃伅
- this.pushData1109(apiRemoteService, param);
- //搴撳尯鍥句粨鎴跨偣浣嶆爣娉�
- this.pushData1110(apiRemoteService, param);
- //搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉�
- this.pushData1111(apiRemoteService, param);
- //浜哄憳淇℃伅
- this.pushData1112(apiRemoteService, param);
- //浼佷笟淇＄敤淇℃伅
- this.pushData1113(apiRemoteService, param);
- //璐㈠姟鎶ヨ〃
- this.pushData1114(apiRemoteService, param);
+// //鎺ㄩ�佸崟浣嶄俊鎭�
+// this.pushData1101(apiRemoteService, param);
+// //搴撳尯淇℃伅
+// this.pushData1102(apiRemoteService, param);
+// //浠撴埧淇℃伅
+// this.pushData1103(apiRemoteService, param);
+// //寤掗棿淇℃伅
+// this.pushData1104(apiRemoteService, param);
+// //璐т綅淇℃伅
+// this.pushData1105(apiRemoteService, param);
+// //娌圭綈淇℃伅
+// this.pushData1106(apiRemoteService, param);
+// //璁惧淇℃伅
+// this.pushData1107(apiRemoteService, param);
+// //鑽墏淇℃伅
+// this.pushData1108(apiRemoteService, param);
+// //鏂囦欢淇℃伅
+// this.pushData1109(apiRemoteService, param);
+// //搴撳尯鍥句粨鎴跨偣浣嶆爣娉�
+// this.pushData1110(apiRemoteService, param);
+// //搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉�
+// this.pushData1111(apiRemoteService, param);
+// //浜哄憳淇℃伅
+// this.pushData1112(apiRemoteService, param);
+// //浼佷笟淇＄敤淇℃伅
+// this.pushData1113(apiRemoteService, param);
+// //璐㈠姟鎶ヨ〃
+// this.pushData1114(apiRemoteService, param);
log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
@@ -108,7 +115,7 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍗曚綅淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1101);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -129,13 +136,13 @@
*/
public void pushData1102(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇搴撳尯淇℃伅
- List<Api1102> list = api1102Rep.findPushData(param.getKqdm());
+ List<Api1102> list = api1102Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌搴撳尯淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1102);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -157,13 +164,13 @@
*/
public void pushData1103(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇浠撴埧淇℃伅
- List<Api1103> list = api1103Rep.findPushData(param.getKqdm());
+ List<Api1103> list = api1103Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌浠撴埧淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1103);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -185,13 +192,13 @@
*/
public void pushData1104(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇寤掗棿淇℃伅
- List<Api1104> list = api1104Rep.findPushData(param.getKqdm());
+ List<Api1104> list = api1104Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌寤掗棿淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1104);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -205,8 +212,6 @@
}
}
}
-
-
}
/**
@@ -214,13 +219,13 @@
*/
public void pushData1105(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇璐т綅淇℃伅
- List<Api1105> list = api1105Rep.findPushData(param.getKqdm());
+ List<Api1105> list = api1105Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌璐т綅淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1105);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -242,13 +247,13 @@
*/
public void pushData1106(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇娌圭綈淇℃伅
- List<Api1106> list = api1106Rep.findPushData(param.getKqdm());
+ List<Api1106> list = api1106Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌娌圭綈淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
-
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1106);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
@@ -269,7 +274,27 @@
* 1107 璁惧淇℃伅
*/
public void pushData1107(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇璁惧淇℃伅
+ List<Api1107> list = api1107Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌璁惧淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1107);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1107 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1107Rep.save(data);
+ }
+ }
+ }
}
@@ -277,7 +302,27 @@
* 1108 鑽墏淇℃伅
*/
public void pushData1108(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鑽墏淇℃伅
+ List<Api1108> list = api1108Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鑽墏淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1108);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1108 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1108Rep.save(data);
+ }
+ }
+ }
}
@@ -285,7 +330,27 @@
* 1109 鏂囦欢淇℃伅
*/
public void pushData1109(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鏂囦欢淇℃伅
+ List<Api1109> list = api1109Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鏂囦欢淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1109);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1109 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1109Rep.save(data);
+ }
+ }
+ }
}
@@ -293,7 +358,27 @@
* 1110 搴撳尯鍥句粨鎴跨偣浣嶆爣娉�
*/
public void pushData1110(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇搴撳尯鍥句粨鎴跨偣浣嶆爣娉�
+ List<Api1110> list = api1110Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌搴撳尯鍥句粨鎴跨偣浣嶆爣娉紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1110);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1110 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1110Rep.save(data);
+ }
+ }
+ }
}
@@ -301,15 +386,54 @@
* 1111 搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉�
*/
public void pushData1111(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉�
+ List<Api1111> list = api1111Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1111);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1111 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1111Rep.save(data);
+ }
+ }
+ }
}
/**
* 1112 浜哄憳淇℃伅
*/
public void pushData1112(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇浜哄憳淇℃伅
+ List<Api1112> list = api1112Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌浜哄憳淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1112);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1112 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1112Rep.save(data);
+ }
+ }
+ }
}
@@ -317,7 +441,27 @@
* 1113 浼佷笟淇＄敤淇℃伅
*/
public void pushData1113(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇浼佷笟淇＄敤淇℃伅
+ List<Api1113> list = api1113Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌浼佷笟淇＄敤淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1113);
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ for (Api1113 data : list) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1113Rep.save(data);
+ }
+ }
+ }
}
@@ -325,7 +469,87 @@
* 1114 璐㈠姟鎶ヨ〃
*/
public void pushData1114(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ this.pushData1501(apiRemoteService, param);
+ this.pushData1502(apiRemoteService, param);
+ this.pushData1503(apiRemoteService, param);
}
+
+ /**
+ * 1501 璐㈠姟鎶ヨ〃-璧勪骇璐熷��--鍗曟潯涓婁紶
+ */
+ public void pushData1501(ApiRemoteService apiRemoteService, ApiParam param) {
+ //鑾峰彇璐㈠姟鎶ヨ〃-璧勪骇璐熷��
+ List<Api1501> list = api1501Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌璧勪骇璐熷�轰俊鎭紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1114_1501);
+ ResponseDto responseDto;
+ Api1501 d;
+ for (Api1501 data : list) {
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1501Rep.save(data);
+ }
+ }
+ }
+ }
+ /**
+ * 1502 璐㈠姟鎶ヨ〃-鐜伴噾娴�
+ */
+ public void pushData1502(ApiRemoteService apiRemoteService, ApiParam param) {
+ //鑾峰彇璐㈠姟鎶ヨ〃-璧勪骇璐熷��
+ List<Api1502> list = api1502Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鐜伴噾娴佷俊鎭紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1114_1502);
+ ResponseDto responseDto;
+ for (Api1502 data : list) {
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1502Rep.save(data);
+ }
+ }
+ }
+ }
+ /**
+ * 1503 璐㈠姟鎶ヨ〃-鍒╂鼎淇℃伅
+ */
+ public void pushData1503(ApiRemoteService apiRemoteService, ApiParam param) {
+ //鑾峰彇璐㈠姟鎶ヨ〃-璧勪骇璐熷��
+ List<Api1503> list = api1503Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍒╂鼎淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1114_1503);
+ ResponseDto responseDto;
+ Api1503 d;
+ for (Api1503 data : list) {
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1503Rep.save(data);
+ }
+ }
+ }
+ }
}
--
Gitblit v1.9.3