From 62b592d65a8c84114b2240ee7ba78c6ae2fe93e6 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 24 十月 2023 14:42:24 +0800
Subject: [PATCH] 武汉省平台-调整接口上报为单条集合形式上报
---
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1204PR.java | 13 ++--
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java | 3
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1102PR.java | 13 ++--
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java | 15 +++--
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1103PR.java | 13 ++--
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java | 13 ++--
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1105PR.java | 13 ++--
src/main/java/com/fzzy/push/whhpjl/dto/WhjlReqDto.java | 2
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java | 13 ++--
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1207PR.java | 13 ++--
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 8 +-
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java | 13 ++--
12 files changed, 63 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 3e204e2..8ab63e0 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -96,10 +96,10 @@
/*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
//涓婃捣甯傚钩鍙�2023鐗堬紝闇�瑕佸悓姝ュ競鍌ㄦ鏂ゅ崟锛屽悓姝ュ競鍌ㄩ┏杩愬崟
- //鍚屾甯傚偍妫�鏂ゅ崟
- fzzySync2101.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
- //鍚屾甯傚偍椹宠繍鍗�
- fzzySync2104.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+// //鍚屾甯傚偍妫�鏂ゅ崟
+// fzzySync2101.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
+// //鍚屾甯傚偍椹宠繍鍗�
+// fzzySync2104.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
}
//璐﹂潰搴撳瓨淇℃伅鍚屾 TODO
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1102PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1102PR.java
index 1f25f5b..fd1a647 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1102PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1102PR.java
@@ -108,7 +108,7 @@
*/
@Expose
public String pushData(List<WhjlApi1102> items) {
- ResponseDto responseDto;
+
String result = "";
String kqdm = items.get(0).getKqdm();
@@ -127,12 +127,11 @@
return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
}
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- responseDto = apiService.pushData(param, apiConf, items);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- ApiInfoData infoData;
- for (WhjlApi1102 data : items) {
+ ResponseDto responseDto;
+ ApiInfoData infoData;
+ for (WhjlApi1102 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
infoData = new ApiInfoData();
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1103PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1103PR.java
index ac5c2ee..0d685e8 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1103PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1103PR.java
@@ -108,7 +108,7 @@
*/
@Expose
public String pushData(List<WhjlApi1103> items) {
- ResponseDto responseDto;
+
String result = "";
String kqdm = items.get(0).getKqdm();
@@ -127,12 +127,11 @@
return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
}
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- responseDto = apiService.pushData(param, apiConf, items);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- ApiInfoData infoData;
- for (WhjlApi1103 data : items) {
+ ResponseDto responseDto;
+ ApiInfoData infoData;
+ for (WhjlApi1103 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
infoData = new ApiInfoData();
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1105PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1105PR.java
index 6fdab11..c539029 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1105PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1105PR.java
@@ -108,7 +108,7 @@
*/
@Expose
public String pushData(List<WhjlApi1105> items) {
- ResponseDto responseDto;
+
String result = "";
String kqdm = items.get(0).getKqdm();
@@ -127,12 +127,11 @@
return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
}
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- responseDto = apiService.pushData(param, apiConf, items);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- ApiInfoData infoData;
- for (WhjlApi1105 data : items) {
+ ResponseDto responseDto;
+ ApiInfoData infoData;
+ for (WhjlApi1105 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
infoData = new ApiInfoData();
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java
index 0be93ca..2bc6043 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java
@@ -108,7 +108,7 @@
*/
@Expose
public String pushData(List<WhjlApi1106> items) {
- ResponseDto responseDto;
+
String result = "";
String kqdm = items.get(0).getKqdm();
@@ -127,12 +127,11 @@
return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
}
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- responseDto = apiService.pushData(param, apiConf, items);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- ApiInfoData infoData;
- for (WhjlApi1106 data : items) {
+ ResponseDto responseDto;
+ ApiInfoData infoData;
+ for (WhjlApi1106 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
infoData = new ApiInfoData();
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
index 407ba0b..c7dad8f 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
@@ -109,7 +109,7 @@
*/
@Expose
public String pushData(List<WhjlApi1107> items) {
- ResponseDto responseDto;
+
String result = "";
String kqdm = items.get(0).getKqdm();
@@ -129,11 +129,14 @@
}
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- responseDto = apiService.pushData(param, apiConf, items);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- ApiInfoData infoData;
- for (WhjlApi1107 data : items) {
+
+
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1107 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
infoData = new ApiInfoData();
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java
index da1de1c..e33729b 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java
@@ -109,7 +109,7 @@
*/
@Expose
public String pushData(List<WhjlApi1111> items) {
- ResponseDto responseDto;
+
String result = "";
String kqdm = items.get(0).getKqdm();
@@ -128,12 +128,11 @@
return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
}
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- responseDto = apiService.pushData(param, apiConf, items);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- ApiInfoData infoData;
- for (WhjlApi1111 data : items) {
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1111 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
infoData = new ApiInfoData();
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1204PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1204PR.java
index f6273e3..bb01c88 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1204PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1204PR.java
@@ -107,7 +107,7 @@
*/
@Expose
public String pushData(List<WhjlApi1204> items) {
- ResponseDto responseDto;
+
String result = "";
String kqdm = items.get(0).getKqdm();
@@ -126,12 +126,11 @@
return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
}
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- responseDto = apiService.pushData(param, apiConf, items);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- ApiInfoData infoData;
- for (WhjlApi1204 data : items) {
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1204 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
infoData = new ApiInfoData();
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1207PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1207PR.java
index 227122e..020f0f4 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1207PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1207PR.java
@@ -132,7 +132,7 @@
*/
@Expose
public String pushData(List<WhjlApi1207> items) {
- ResponseDto responseDto;
+
String result = "";
String kqdm = items.get(0).getKqdm();
@@ -151,12 +151,11 @@
return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
}
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- responseDto = apiService.pushData(param, apiConf, items);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- ApiInfoData infoData;
- for (WhjlApi1207 data : items) {
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1207 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
infoData = new ApiInfoData();
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java
index 04e1fca..a0abee7 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java
@@ -109,7 +109,7 @@
*/
@Expose
public String pushData(List<WhjlApi1214> items) {
- ResponseDto responseDto;
+
String result = "";
String kqdm = items.get(0).getKqdm();
@@ -128,12 +128,11 @@
return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
}
- //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- responseDto = apiService.pushData(param, apiConf, items);
- if (responseDto.getSuccess() == 0) {
- //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- ApiInfoData infoData;
- for (WhjlApi1214 data : items) {
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1214 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
infoData = new ApiInfoData();
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
index 01e6be7..9db3102 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -110,8 +110,7 @@
log.info("韬唤绛惧悕锛�" + accessToken);
reqData.setAccesstoken(MyMD5Util.encrypt(accessToken));
//鏁版嵁鎬绘潯鏁�
- List<Object> list = (List<Object>)data;
- reqData.setDatalength(list.size());
+ reqData.setDatalength(1);
//鏁版嵁涓讳綋锛岃繘琛孲M4鍔犲瘑
reqData.setData(SM4Util.encryptEcb(conf.getPublicKey(), jsonData));
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
diff --git a/src/main/java/com/fzzy/push/whhpjl/dto/WhjlReqDto.java b/src/main/java/com/fzzy/push/whhpjl/dto/WhjlReqDto.java
index 86abf9a..3f05f2b 100644
--- a/src/main/java/com/fzzy/push/whhpjl/dto/WhjlReqDto.java
+++ b/src/main/java/com/fzzy/push/whhpjl/dto/WhjlReqDto.java
@@ -45,7 +45,7 @@
/**
* 鏁版嵁鎬绘潯鏁�
*/
- private Integer datalength;
+ private Integer datalength = 1;
/**
* 涓婁紶鏁版嵁(闆嗗悎褰㈠紡)
--
Gitblit v1.9.3