From 86d368337175a7d7eed5e9330bd80a838ab4f396 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 09 十一月 2023 17:25:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java | 164 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 126 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
index cceda4a..6f9cb69 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
@@ -4,14 +4,10 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
-import com.fzzy.api.entity.Api1310;
-import com.fzzy.api.entity.Api1401;
-import com.fzzy.api.entity.Api1403;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
-import com.fzzy.api.view.repository.Api1401Rep;
-import com.fzzy.api.view.repository.Api1403Rep;
-import com.fzzy.api.view.repository.Api1404Rep;
+import com.fzzy.api.view.repository.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -34,9 +30,17 @@
@Autowired
private Api1401Rep api1401Rep;
@Autowired
+ private Api1402Rep api1402Rep;
+ @Autowired
private Api1403Rep api1403Rep;
@Autowired
private Api1404Rep api1404Rep;
+ @Autowired
+ private Api1405Rep api1405Rep;
+ @Autowired
+ private Api1201Rep api1201Rep;
+ @Autowired
+ private Api1310Rep api1310Rep;
@Override
public String getProtocol() {
@@ -65,12 +69,14 @@
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍌ㄥ瑙勬ā锛屼笉鎺ㄩ��-----");
return;
}
+ param.setInteCategory(Constant.API_CATEGORY_14);
param.setInteId(SH2023Constant.SH_2023_API_CODE_1401);
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- ResponseDto responseDto = apiRemoteService.pushData(param, list);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- for (Api1401 data : list) {
+
+ ResponseDto responseDto;
+ for (Api1401 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);
@@ -79,34 +85,55 @@
}
}
}
-
}
/**
* 1402 鍌ㄥ璁″垝淇℃伅
*/
public void pushData1402(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ //鑾峰彇鍌ㄥ璁″垝
+ List<Api1402> list = api1402Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍌ㄥ璁″垝锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteCategory(Constant.API_CATEGORY_14);
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1402);
+
+ ResponseDto responseDto;
+ for (Api1402 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);
+ //鏇存柊鐘舵��
+ api1402Rep.save(data);
+ }
+ }
+ }
}
/**
* 1403 杞崲璁″垝淇℃伅
*/
public void pushData1403(ApiRemoteService apiRemoteService, ApiParam param) {
- //鑾峰彇鍌ㄥ瑙勬ā
+ //鑾峰彇杞崲璁″垝
List<Api1403> list = api1403Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
- log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍌ㄥ瑙勬ā锛屼笉鎺ㄩ��-----");
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌杞崲璁″垝锛屼笉鎺ㄩ��-----");
return;
}
+ param.setInteCategory(Constant.API_CATEGORY_14);
param.setInteId(SH2023Constant.SH_2023_API_CODE_1403);
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- ResponseDto responseDto = apiRemoteService.pushData(param, list);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- for (Api1403 data : list) {
+
+ ResponseDto responseDto;
+ for (Api1403 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);
//鏇存柊鐘舵��
@@ -114,42 +141,62 @@
}
}
}
-
}
/**
* 1404 杞崲璁″垝鏄庣粏淇℃伅
*/
public void pushData1404(ApiRemoteService apiRemoteService, ApiParam param) {
- ///鑾峰彇鍌ㄥ瑙勬ā
- List<Api1401> list = api1401Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+ //鑾峰彇杞崲璁″垝鏄庣粏
+ List<Api1404> list = api1404Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
- log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍌ㄥ瑙勬ā锛屼笉鎺ㄩ��-----");
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌杞崲璁″垝鏄庣粏锛屼笉鎺ㄩ��-----");
return;
}
- param.setInteId(SH2023Constant.SH_2023_API_CODE_1401);
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- ResponseDto responseDto = apiRemoteService.pushData(param, list);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- for (Api1401 data : list) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ param.setInteCategory(Constant.API_CATEGORY_14);
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1404);
+ ResponseDto responseDto;
+ for (Api1404 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);
//鏇存柊鐘舵��
- api1401Rep.save(data);
+ api1404Rep.save(data);
}
}
}
-
}
/**
* 1405 椤圭洰淇℃伅
*/
public void pushData1405(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+// TODO 椤圭洰淇℃伅 寰呭畾
+// //鑾峰彇椤圭洰淇℃伅
+// List<Api1405> list = api1405Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+//
+// if (null == list || list.isEmpty()) {
+// log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌椤圭洰淇℃伅锛屼笉鎺ㄩ��-----");
+// return;
+// }
+// param.setInteId(SH2023Constant.SH_2023_API_CODE_1405);
+// //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+// ResponseDto responseDto = apiRemoteService.pushData(param, list);
+// if (responseDto.getSuccess() == 0) {
+// //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+// for (Api1405 data : list) {
+// if (Constant.CZBZ_I.equals(data.getCzbz())) {
+//
+// data.setCzbz(Constant.CZBZ_U);
+// //鏇存柊鐘舵��
+// api1405Rep.save(data);
+// }
+// }
+// }
}
@@ -157,15 +204,56 @@
* 2203 浜ゆ槗涓績鍚堝悓
*/
public void pushData2203(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
-
+ //鑾峰彇浜ゆ槗涓績鍚堝悓
+// List<Api1201> list = api1201Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+//
+// if (null == list || list.isEmpty()) {
+// log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌杞崲璁″垝鏄庣粏锛屼笉鎺ㄩ��-----");
+// return;
+// }
+// param.setInteCategory(Constant.API_CATEGORY_14);
+// param.setInteId(SH2023Constant.SH_2023_API_CODE_2203);
+//
+// ResponseDto responseDto;
+// for (Api1201 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);
+// //鏇存柊鐘舵��
+// api1201Rep.save(data);
+// }
+// }
+// }
}
/**
* 2204 瀹氬寲姘存楠�
*/
public void pushData2204(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
-
+ //鑾峰彇瀹氬寲姘存楠�
+// List<Api1310> list = api1310Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+//
+// if (null == list || list.isEmpty()) {
+// log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌瀹氬寲姘存楠岋紝涓嶆帹閫�-----");
+// return;
+// }
+// param.setInteCategory(Constant.API_CATEGORY_14);
+// param.setInteId(SH2023Constant.SH_2023_API_CODE_2204);
+//
+// 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);
+// //鏇存柊鐘舵��
+// api1310Rep.save(data);
+// }
+// }
+// }
}
}
--
Gitblit v1.9.3