From 3a7fd31b5beadda5b3c12450935db9913a52bd92 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 02 三月 2024 11:25:36 +0800
Subject: [PATCH] 有数数据同步及推送
---
src/main/java/com/fzzy/push/impl/ComPushService12.java | 74 ++++++++++
src/main/java/com/fzzy/push/nx2023/NX2023PushService14.java | 4
src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService13.java | 3
src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java | 5
src/main/java/com/fzzy/push/nx2023/NX2023PushService11.java | 31 ----
src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java | 3
src/main/java/com/fzzy/push/nx2023/NX2023PushService12.java | 35 ++++
src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java | 6
src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java | 5
src/main/java/com/fzzy/api/timer/SyncDataScheduled.java | 124 +++++++++--------
src/main/java/com/fzzy/push/whhpjl/WhjlPushService13.java | 4
src/main/java/com/fzzy/api/timer/PushDataScheduled.java | 40 -----
src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java | 9 -
src/main/java/com/fzzy/push/nx2023/NX2023OrderApiServiceImpl.java | 2
src/main/java/com/fzzy/push/nx2023/NX2023PushService13.java | 8
src/main/java/com/fzzy/push/gd2022/GD2022PushService12.java | 24 ++-
16 files changed, 211 insertions(+), 166 deletions(-)
diff --git a/src/main/java/com/fzzy/api/timer/PushDataScheduled.java b/src/main/java/com/fzzy/api/timer/PushDataScheduled.java
index fb515ed..5dc67d9 100644
--- a/src/main/java/com/fzzy/api/timer/PushDataScheduled.java
+++ b/src/main/java/com/fzzy/api/timer/PushDataScheduled.java
@@ -97,43 +97,7 @@
return;
}
- //鏍稿鏃堕棿鏄惁鍖归厤
- if (conf.getPushHour99().equals(ApiConfs.TIME_ALL)) {
- isExecute = true;
- } else {
- int hourOfDay = ContextUtil.getHourOfDay(exeDate);
- if (String.valueOf(hourOfDay).equals(conf.getPushHour11())) {
- isExecute = true;
-
- if (!isUpdateStart) {
- start = DateUtils.addDays(start, -1);
- isUpdateStart = true;
- }
- } else {
- isExecute = false;
- }
- }
- if (!isExecute) {
- log.debug("------->>>>>>>>>> 涓氬姟鏁版嵁鎺ㄩ��---鏃堕棿閰嶇疆灏忔椂涓嶅尮閰�");
- return;
- }
-
- //鏍稿鏃堕棿鍒嗛挓鏄惁鍖归厤
- int minute = ContextUtil.getMinuteOfHour(exeDate);
- if (String.valueOf(minute).equals(conf.getPushMinute99())) {
- isExecute = true;
- if (!isUpdateStart) {
- start = DateUtils.addHours(start, -1);
- }
- } else {
- isExecute = false;
- }
-
- if (!isExecute) {
- log.debug("------->>>>>>>>>> 涓氬姟鏁版嵁鎺ㄩ��---鏃堕棿閰嶇疆鍒嗛挓涓嶅尮閰�");
- return;
- }
-
+ log.info("------->>>>>>>>>> 涓氬姟鏁版嵁鎺ㄩ��---寮�濮嬫煡璇㈢浉鍏充笟鍔℃暟鎹繘琛屾帹閫�");
ApiParam param = new ApiParam();
param.setPushProtocol(conf.getPushProtocol());
param.setKqdm(conf.getKqdm());
@@ -229,6 +193,8 @@
return;
}
+ log.info("------->>>>>>>>>> 鍩虹鏁版嵁鎺ㄩ��---寮�濮嬫煡璇㈢浉鍏冲熀纭�鏁版嵁杩涜鎺ㄩ��");
+
ApiParam param = new ApiParam();
param.setPushProtocol(conf.getPushProtocol());
param.setKqdm(conf.getKqdm());
diff --git a/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java b/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
index f232f3a..1b5d45f 100644
--- a/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
+++ b/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
@@ -36,7 +36,8 @@
* <p>
* 鍥哄畾鏃堕棿锛�0鍒嗛挓鍜�30鍒嗛挓鎵ц
*/
- @Scheduled(cron = "0 0,30 * * * ? ")
+// @Scheduled(cron = "0 0,30 * * * ? ")
+ @Scheduled(cron = "0 * * * * ? ")
public void scheduled() {
log.info("绯荤粺鎵ц瀹氭椂鏁版嵁鍚屾鎿嶄綔<<<<<<<<<<<<<--------");
@@ -72,67 +73,68 @@
Date start = exeDate;
- //鏄惁鎵ц
- boolean isExecute = false;
- boolean isUpdateStart = false;
- //鏍稿澶╂槸鍚﹀尮閰�
- if (conf.getSyncDay99().equals(ApiConfs.TIME_ALL)) {
- isExecute = true;
- } else {
- int dayOfWeek = ContextUtil.getDayOfWeek(exeDate);
- if (String.valueOf(dayOfWeek).equals(conf.getSyncDay11())) {
- isExecute = true;
+// //鏄惁鎵ц
+// boolean isExecute = false;
+// boolean isUpdateStart = false;
+// //鏍稿澶╂槸鍚﹀尮閰�
+// if (conf.getSyncDay99().equals(ApiConfs.TIME_ALL)) {
+// isExecute = true;
+// } else {
+// int dayOfWeek = ContextUtil.getDayOfWeek(exeDate);
+// if (String.valueOf(dayOfWeek).equals(conf.getSyncDay11())) {
+// isExecute = true;
+//
+// //寮�濮嬫椂闂存彁鍓�7澶�
+// start = DateUtils.addDays(start, -7);
+// isUpdateStart = true;
+// } else {
+// isExecute = false;
+// }
+// }
+//
+// if (!isExecute) {
+// log.debug("涓氬姟鏁版嵁鍚屾---鏃堕棿閰嶇疆澶╀笉鍖归厤<<<<<<<<<<<<<-------");
+// return;
+// }
+//
+// //鏍稿鏃堕棿鏄惁鍖归厤
+// if (conf.getSyncHour99().equals(ApiConfs.TIME_ALL)) {
+// isExecute = true;
+// } else {
+// int hourOfDay = ContextUtil.getHourOfDay(exeDate);
+// if (String.valueOf(hourOfDay).equals(conf.getSyncHour11())) {
+// isExecute = true;
+//
+// if (!isUpdateStart) {
+// start = DateUtils.addDays(start, -1);
+// isUpdateStart = true;
+// }
+// } else {
+// isExecute = false;
+// }
+// }
+// if (!isExecute) {
+// log.debug("涓氬姟鏁版嵁鍚屾---鏃堕棿閰嶇疆灏忔椂涓嶅尮閰�<<<<<<<<<<<<<-------");
+// return;
+// }
+//
+// //鏍稿鏃堕棿鍒嗛挓鏄惁鍖归厤
+// int minute = ContextUtil.getMinuteOfHour(exeDate);
+// if (String.valueOf(minute).equals(conf.getSyncMinute99())) {
+// isExecute = true;
+// if (!isUpdateStart) {
+// start = DateUtils.addHours(start, -1);
+// }
+// } else {
+// isExecute = false;
+// }
+//
+// if (!isExecute) {
+// log.debug("涓氬姟鏁版嵁鍚屾---鏃堕棿閰嶇疆鍒嗛挓涓嶅尮閰�<<<<<<<<<<<<<-------");
+// return;
+// }
- //寮�濮嬫椂闂存彁鍓�7澶�
- start = DateUtils.addDays(start, -7);
- isUpdateStart = true;
- } else {
- isExecute = false;
- }
- }
-
- if (!isExecute) {
- log.debug("涓氬姟鏁版嵁鍚屾---鏃堕棿閰嶇疆澶╀笉鍖归厤<<<<<<<<<<<<<-------");
- return;
- }
-
- //鏍稿鏃堕棿鏄惁鍖归厤
- if (conf.getSyncHour99().equals(ApiConfs.TIME_ALL)) {
- isExecute = true;
- } else {
- int hourOfDay = ContextUtil.getHourOfDay(exeDate);
- if (String.valueOf(hourOfDay).equals(conf.getSyncHour11())) {
- isExecute = true;
-
- if (!isUpdateStart) {
- start = DateUtils.addDays(start, -1);
- isUpdateStart = true;
- }
- } else {
- isExecute = false;
- }
- }
- if (!isExecute) {
- log.debug("涓氬姟鏁版嵁鍚屾---鏃堕棿閰嶇疆灏忔椂涓嶅尮閰�<<<<<<<<<<<<<-------");
- return;
- }
-
- //鏍稿鏃堕棿鍒嗛挓鏄惁鍖归厤
- int minute = ContextUtil.getMinuteOfHour(exeDate);
- if (String.valueOf(minute).equals(conf.getSyncMinute99())) {
- isExecute = true;
- if (!isUpdateStart) {
- start = DateUtils.addHours(start, -1);
- }
- } else {
- isExecute = false;
- }
-
- if (!isExecute) {
- log.debug("涓氬姟鏁版嵁鍚屾---鏃堕棿閰嶇疆鍒嗛挓涓嶅尮閰�<<<<<<<<<<<<<-------");
- return;
- }
-
+ log.debug("涓氬姟鏁版嵁鍚屾---寮�濮嬫煡璇笟鍔℃暟鎹繘琛屽悓姝�<<<<<<<<<<<<<-------");
ApiParam param = new ApiParam();
param.setSyncProtocol(conf.getSyncProtocol());
param.setPushProtocol(conf.getPushProtocol());
diff --git a/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java b/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java
index 65caab2..55e4399 100644
--- a/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java
+++ b/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService12.java
@@ -3,6 +3,7 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.service.SyncService11;
+import com.fzzy.api.service.SyncService12;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1204;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1207;
import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1214;
@@ -19,7 +20,7 @@
*/
@Slf4j
@Component
-public class Fzzy40ToWhjlSyncService12 implements SyncService11 {
+public class Fzzy40ToWhjlSyncService12 implements SyncService12 {
@Autowired
private Fz40ToWhjlSync1204 fz40ToWhjlSync1204;
diff --git a/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService13.java b/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService13.java
index 03892a5..a0bff2d 100644
--- a/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService13.java
+++ b/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService13.java
@@ -3,6 +3,7 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.service.SyncService11;
+import com.fzzy.api.service.SyncService13;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -17,7 +18,7 @@
*/
@Slf4j
@Component
-public class Fzzy40ToWhjlSyncService13 implements SyncService11 {
+public class Fzzy40ToWhjlSyncService13 implements SyncService13 {
@Override
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022PushService12.java b/src/main/java/com/fzzy/push/gd2022/GD2022PushService12.java
index b11611a..895e140 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022PushService12.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022PushService12.java
@@ -33,17 +33,11 @@
public void pushData(ApiParam param) {
log.info("------->>>>绮璐攢 鎺ュ彛妯″潡涓婃姤寮�濮�");
+ //鎬ц川杞彉
+ pushService.pushData1212(apiRemoteService, param);
+
//鍚堝悓
pushService.pushData1201(apiRemoteService, param);
-
- //绮搴撳瓨鏁版嵁
- pushService.pushData1208(apiRemoteService, param);
-
- //鎹熸孩鍗�
- pushService.pushData1209(apiRemoteService, param);
-
- //鎬ц川杞彉
- pushService.pushData1210(apiRemoteService, param);
//鍏ュ簱鏁版嵁 + 鍏ュ簱杩囩
pushService.pushData1202(apiRemoteService, param);
@@ -63,6 +57,18 @@
//鍊掍粨
pushService.pushData1207(apiRemoteService, param);
+ //鎹熸孩鍗�
+ pushService.pushData1209(apiRemoteService, param);
+
+ //绮搴撳瓨鏁版嵁
+ pushService.pushData1208(apiRemoteService, param);
+
+ //鎬ц川杞彉
+ pushService.pushData1210(apiRemoteService, param);
+
+ //璐﹂潰搴撳瓨
+ pushService.pushData1211(apiRemoteService, param);
+
//鏂囦欢
pushService.pushData1109(apiRemoteService, param);
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService12.java b/src/main/java/com/fzzy/push/impl/ComPushService12.java
index e38971e..85ac8ea 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService12.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService12.java
@@ -6,6 +6,7 @@
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.*;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -15,6 +16,7 @@
* @author: andy.jia
* @update-time: 2022/10/28 2:02
*/
+@Slf4j
@Service
public class ComPushService12 {
@@ -40,6 +42,10 @@
private Api1209Rep api1209Rep;
@Autowired
private Api1210Rep api1210Rep;
+ @Autowired
+ private Api1211Rep api1211Rep;
+ @Autowired
+ private Api1212Rep api1212Rep;
/**
* 1109 鏂囦欢淇℃伅鍚屾
@@ -49,6 +55,7 @@
List<Api1109> items = api1109Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌鏂囦欢淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
@@ -79,6 +86,7 @@
List<Api1201> items = api1201Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌鍚堝悓淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
@@ -107,6 +115,7 @@
public void pushData1202(ApiRemoteService apiRemoteService, ApiParam param) {
List<Api1202> items = api1202Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌绮鍏ュ簱淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
param.setInteCategory(Constant.API_CATEGORY_12);
@@ -134,6 +143,7 @@
List<Api1203> items = api1203Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌绮鍏ュ簱妫�楠屼俊鎭紝涓嶆帹閫�-----");
return;
}
@@ -162,6 +172,7 @@
List<Api1204> items = api1204Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌绮鍏ュ簱缁撶畻淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
@@ -190,6 +201,7 @@
List<Api1205> items = api1205Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌绮鍑哄簱淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
@@ -219,6 +231,7 @@
List<Api1206> items = api1206Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌绮鍑哄簱缁撶畻淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
@@ -247,6 +260,7 @@
List<Api1207> items = api1207Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌鍊掍粨淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
@@ -279,6 +293,7 @@
List<Api1208> items = api1208Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌绮搴撳瓨淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
param.setInteCategory(Constant.API_CATEGORY_12);
@@ -307,6 +322,7 @@
public void pushData1209(ApiRemoteService apiRemoteService, ApiParam param) {
List<Api1209> items = api1209Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌绮搴撳瓨淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
@@ -335,6 +351,7 @@
List<Api1210> items = api1210Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == items || items.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌绮搴撳瓨淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
@@ -353,4 +370,61 @@
}
}
}
+
+ /**
+ * 1211 璐﹂潰搴撳瓨
+ */
+ public void pushData1211(ApiRemoteService apiRemoteService, ApiParam param) {
+ //璐﹂潰搴撳瓨
+ List<Api1211> list = api1211Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌绮搴撳瓨淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteCategory(Constant.API_CATEGORY_12);
+ param.setInteId(Constant.API_CODE_1211);
+
+ ResponseDto responseDto;
+ for (Api1211 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);
+ //鏇存柊鐘舵��
+ api1211Rep.save(data);
+ }
+ }
+ }
+ }
+
+ /**
+ * 1212 瀹㈡埛淇℃伅
+ */
+ public void pushData1212(ApiRemoteService apiRemoteService, ApiParam param) {
+ //鑾峰彇瀹㈡埛淇℃伅
+ List<Api1212> list = api1212Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----鏈幏鍙栧埌瀹㈡埛淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteCategory(Constant.API_CATEGORY_12);
+ param.setInteId(Constant.API_CODE_1212);
+
+ ResponseDto responseDto;
+ for (Api1212 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);
+ //鏇存柊鐘舵��
+ api1212Rep.save(data);
+ }
+ }
+ }
+ }
}
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023OrderApiServiceImpl.java b/src/main/java/com/fzzy/push/nx2023/NX2023OrderApiServiceImpl.java
index 656ed7d..d29b812 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023OrderApiServiceImpl.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023OrderApiServiceImpl.java
@@ -105,7 +105,7 @@
nX2023PushService11.pushData1108(apiRemoteService, param);
break;
case "1109":
- nX2023PushService11.pushData1109(apiRemoteService, param);
+ nX2023PushService12.pushData1109(apiRemoteService, param);
break;
case "1110":
nX2023PushService11.pushData1110(apiRemoteService, param);
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023PushService11.java b/src/main/java/com/fzzy/push/nx2023/NX2023PushService11.java
index a70224b..419d236 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023PushService11.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023PushService11.java
@@ -41,8 +41,7 @@
private Api1107Rep api1107Rep;
@Autowired
private Api1108Rep api1108Rep;
- @Autowired
- private Api1109Rep api1109Rep;
+
@Autowired
private Api1110Rep api1110Rep;
@Autowired
@@ -82,8 +81,7 @@
this.pushData1107(apiRemoteService, param);
//鑽墏淇℃伅
this.pushData1108(apiRemoteService, param);
- //鏂囦欢淇℃伅
- this.pushData1109(apiRemoteService, param);
+
//搴撳尯鍥句粨鎴跨偣浣嶆爣娉�
this.pushData1110(apiRemoteService, param);
//搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉�
@@ -313,32 +311,7 @@
}
}
- /**
- * 1109 鏂囦欢淇℃伅
- */
- public void pushData1109(ApiRemoteService apiRemoteService, ApiParam param) {
- //鑾峰彇鏂囦欢淇℃伅
- List<Api1109> list = api1109Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
- if (null == list || list.isEmpty()) {
- log.error("-----瀹佸鐪佸钩鍙�2023鐗堬細鏈幏鍙栧埌鏂囦欢淇℃伅锛屼笉鎺ㄩ��-----");
- return;
- }
- param.setInteCategory(Constant.API_CATEGORY_11);
- param.setInteId(NX2023Constant.NX_2023_API_CODE_1109);
-
- ResponseDto responseDto;
- for (Api1109 data : list) {
- param.setBizId(data.getBizId());
- responseDto = apiRemoteService.pushData(param, data);
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
- api1109Rep.updateStatus(data.getId(), Constant.CZBZ_U);
- }
- }
- }
-
- }
/**
* 1110 搴撳尯鍥句粨鎴跨偣浣嶆爣娉�
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023PushService12.java b/src/main/java/com/fzzy/push/nx2023/NX2023PushService12.java
index 18dcd11..357da06 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023PushService12.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023PushService12.java
@@ -6,7 +6,7 @@
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
-import com.fzzy.api.service.PushService11;
+import com.fzzy.api.service.PushService12;
import com.fzzy.api.view.repository.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,11 +22,13 @@
*/
@Slf4j
@Component
-public class NX2023PushService12 implements PushService11 {
+public class NX2023PushService12 implements PushService12 {
@Autowired
private NX2023ApiRemoteService apiRemoteService;
+ @Autowired
+ private Api1109Rep api1109Rep;
@Autowired
private Api1201Rep api1201Rep;
@Autowired
@@ -85,6 +87,8 @@
this.pushData1211(apiRemoteService, param);
//瀹㈡埛淇℃伅
this.pushData1212(apiRemoteService, param);
+ //鏂囦欢淇℃伅
+ this.pushData1109(apiRemoteService, param);
log.info("------->>>>绮璐攢 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
@@ -428,4 +432,31 @@
}
}
+ /**
+ * 1109 鏂囦欢淇℃伅
+ */
+ public void pushData1109(ApiRemoteService apiRemoteService, ApiParam param) {
+ //鑾峰彇鏂囦欢淇℃伅
+ List<Api1109> list = api1109Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----瀹佸鐪佸钩鍙�2023鐗堬細鏈幏鍙栧埌鏂囦欢淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteCategory(Constant.API_CATEGORY_11);
+ param.setInteId(NX2023Constant.NX_2023_API_CODE_1109);
+
+ ResponseDto responseDto;
+ for (Api1109 data : list) {
+ param.setBizId(data.getBizId());
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ api1109Rep.updateStatus(data.getId(), Constant.CZBZ_U);
+ }
+ }
+ }
+
+ }
+
}
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023PushService13.java b/src/main/java/com/fzzy/push/nx2023/NX2023PushService13.java
index 6341e61..5b6adcf 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023PushService13.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023PushService13.java
@@ -6,7 +6,7 @@
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
-import com.fzzy.api.service.PushService11;
+import com.fzzy.api.service.PushService13;
import com.fzzy.api.view.repository.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +22,7 @@
*/
@Slf4j
@Component
-public class NX2023PushService13 implements PushService11 {
+public class NX2023PushService13 implements PushService13 {
@Autowired
@@ -279,7 +279,7 @@
List<Api1308> list = api1308Rep.findAll();
if (null == list || list.isEmpty()) {
- log.error("-----瀹佸鐪佸钩鍙�2023鐗堬細鏈幏鍙栧埌浠撳唴瑙嗛鍥惧儚锛屼笉鎺ㄩ��-----");
+ log.error("-----瀹佸鐪佸钩鍙�2023鐗堬細鏈幏鍙栧埌瑙嗛鐩戞帶寮傚父浜嬩欢鍛婅锛屼笉鎺ㄩ��-----");
return;
}
param.setInteCategory(Constant.API_CATEGORY_13);
@@ -308,7 +308,7 @@
List<Api1309> list = api1309Rep.findAll();
if (null == list || list.isEmpty()) {
- log.error("-----瀹佸鐪佸钩鍙�2023鐗堬細鏈幏鍙栧埌浠撳唴瑙嗛鍥惧儚锛屼笉鎺ㄩ��-----");
+ log.error("-----瀹佸鐪佸钩鍙�2023鐗堬細鏈幏鍙栧埌杩濊棰勮淇℃伅锛屼笉鎺ㄩ��-----");
return;
}
param.setInteCategory(Constant.API_CATEGORY_13);
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023PushService14.java b/src/main/java/com/fzzy/push/nx2023/NX2023PushService14.java
index 244f754..1fcb688 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023PushService14.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023PushService14.java
@@ -7,7 +7,7 @@
import com.fzzy.api.entity.Api1403;
import com.fzzy.api.entity.Api1404;
import com.fzzy.api.service.ApiRemoteService;
-import com.fzzy.api.service.PushService11;
+import com.fzzy.api.service.PushService14;
import com.fzzy.api.view.repository.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +23,7 @@
*/
@Slf4j
@Component
-public class NX2023PushService14 implements PushService11 {
+public class NX2023PushService14 implements PushService14 {
@Autowired
private NX2023ApiRemoteService apiRemoteService;
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
index 2ada2b2..b880006 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
@@ -1,21 +1,16 @@
package com.fzzy.push.sh2023;
-import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
-import com.fzzy.api.service.PushService11;
+import com.fzzy.api.service.PushService12;
import com.fzzy.api.view.repository.*;
-import com.fzzy.push.sh2023.dto.SH2023Api2101;
-import com.fzzy.push.sh2023.dto.SH2023Api2104;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
import java.util.List;
/**
@@ -26,7 +21,7 @@
*/
@Slf4j
@Component
-public class SH2023PushService12 implements PushService11 {
+public class SH2023PushService12 implements PushService12 {
@Autowired
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
index 58206dc..2cd9125 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
@@ -7,15 +7,13 @@
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
-import com.fzzy.api.service.PushService11;
+import com.fzzy.api.service.PushService13;
import com.fzzy.api.view.repository.*;
import com.fzzy.push.sh2023.dto.SH2023Api1311;
import com.fzzy.push.sh2023.dto.SH2023Api2103;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
import java.util.List;
/**
@@ -26,7 +24,7 @@
*/
@Slf4j
@Component
-public class SH2023PushService13 implements PushService11 {
+public class SH2023PushService13 implements PushService13 {
@Autowired
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
index 6f9cb69..bd8d7c3 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
@@ -6,12 +6,11 @@
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
-import com.fzzy.api.service.PushService11;
+import com.fzzy.api.service.PushService14;
import com.fzzy.api.view.repository.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.List;
/**
@@ -22,7 +21,7 @@
*/
@Slf4j
@Component
-public class SH2023PushService14 implements PushService11 {
+public class SH2023PushService14 implements PushService14 {
@Autowired
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java
index bbf66cc..ed05d2d 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java
@@ -7,7 +7,7 @@
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiRemoteService;
-import com.fzzy.api.service.PushService11;
+import com.fzzy.api.service.PushService12;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1204;
@@ -16,7 +16,6 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.ArrayList;
import java.util.List;
@@ -28,7 +27,7 @@
*/
@Slf4j
@Component
-public class WhjlPushService12 implements PushService11 {
+public class WhjlPushService12 implements PushService12 {
@Autowired
private WhjlApiRemoteService apiRemoteService;
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService13.java b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService13.java
index c58b9cc..7f0ba47 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService13.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService13.java
@@ -2,7 +2,7 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
-import com.fzzy.api.service.PushService11;
+import com.fzzy.api.service.PushService13;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -15,7 +15,7 @@
*/
@Slf4j
@Component
-public class WhjlPushService13 implements PushService11 {
+public class WhjlPushService13 implements PushService13 {
@Autowired
private WhjlApiRemoteService apiRemoteService;
--
Gitblit v1.9.3