From c2af03ac2c2122100873a416f70cdf56e5111089 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 02 三月 2024 19:04:21 +0800
Subject: [PATCH] 解决广东省协议下数据定时同步及上报不执行问题2

---
 src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java |   26 +++++++++++--
 src/main/java/com/fzzy/push/impl/ComPushService11.java      |   54 ++++++++++++++++++++------
 2 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java b/src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java
index 9b97ab2..fb8a814 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java
@@ -31,16 +31,34 @@
     @Override
     public void pushData(ApiParam param) {
 
-        //鏂囦欢淇℃伅鎺ㄩ�侊紝杞Щ鍒�12澶х被杩涜鎺ㄩ��
-
-        //璁惧
+        //鍗曚綅淇℃伅
+        pushService.pushData1101(apiRemoteService, param);
+        //搴撳尯淇℃伅
+        pushService.pushData1102(apiRemoteService, param);
+        //浠撴埧淇℃伅
+        pushService.pushData1103(apiRemoteService, param);
+        //寤掗棿淇℃伅
+        pushService.pushData1104(apiRemoteService, param);
+        //璐т綅淇℃伅
+        pushService.pushData1105(apiRemoteService, param);
+        //娌圭綈淇℃伅
+        pushService.pushData1106(apiRemoteService, param);
+        //璁惧淇℃伅
         pushService.pushData1107(apiRemoteService, param);
+        //鑽墏淇℃伅
+        pushService.pushData1108(apiRemoteService, param);
+        //搴撳尯鍥句粨鎴跨偣浣嶄俊鎭�
+        pushService.pushData1110(apiRemoteService, param);
 
         //搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆暟鎹�
         pushService.pushData1111(apiRemoteService, param);
 
-        //浜哄憳
+        //浜哄憳淇℃伅
         pushService.pushData1112(apiRemoteService, param);
+        //浼佷笟淇$敤淇℃伅
+        pushService.pushData1113(apiRemoteService, param);
+
+        //鏂囦欢淇℃伅鎺ㄩ�侊紝杞Щ鍒�12澶х被杩涜鎺ㄩ��
     }
 
 }
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService11.java b/src/main/java/com/fzzy/push/impl/ComPushService11.java
index e810868..20b66af 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService11.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService11.java
@@ -36,19 +36,19 @@
     @Autowired
     private Api1108Rep api1108Rep;
     @Autowired
-    private Api1109Rep api1109Rep;
-    @Autowired
     private Api1110Rep api1110Rep;
     @Autowired
     private Api1111Rep api1111Rep;
     @Autowired
     private Api1112Rep api1112Rep;
+    @Autowired
+    private Api1113Rep api1113Rep;
     /**
      * 1101 鍗曚綅淇℃伅
      */
     public void pushData1101(ApiRemoteService apiRemoteService, ApiParam param) {
 
-        List<Api1101> items = api1101Rep.findPushData(param.getKqdm());
+        List<Api1101> items = api1101Rep.getDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
             return;
         }
@@ -74,7 +74,7 @@
      */
     public void pushData1102(ApiRemoteService apiRemoteService, ApiParam param) {
 
-        List<Api1102> items = api1102Rep.findPushData(param.getKqdm());
+        List<Api1102> items = api1102Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
             return;
         }
@@ -100,7 +100,7 @@
      */
     public void pushData1103(ApiRemoteService apiRemoteService, ApiParam param) {
 
-        List<Api1103> items = api1103Rep.findPushData(param.getKqdm());
+        List<Api1103> items = api1103Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
             return;
         }
@@ -127,7 +127,7 @@
      */
     public void pushData1104(ApiRemoteService apiRemoteService, ApiParam param) {
 
-        List<Api1104> items = api1104Rep.findPushData(param.getKqdm());
+        List<Api1104> items = api1104Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
             return;
         }
@@ -154,7 +154,7 @@
      */
     public void pushData1105(ApiRemoteService apiRemoteService, ApiParam param) {
 
-        List<Api1105> items = api1105Rep.findPushData(param.getKqdm());
+        List<Api1105> items = api1105Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
             return;
         }
@@ -181,7 +181,7 @@
      */
     public void pushData1106(ApiRemoteService apiRemoteService, ApiParam param) {
 
-        List<Api1106> items = api1106Rep.findPushData(param.getKqdm());
+        List<Api1106> items = api1106Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
             return;
         }
@@ -208,7 +208,7 @@
      */
     public void pushData1107(ApiRemoteService apiRemoteService, ApiParam param) {
 
-        List<Api1107> items = api1107Rep.findPushData(param.getKqdm());
+        List<Api1107> items = api1107Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
             return;
         }
@@ -234,7 +234,7 @@
      */
     public void pushData1108(ApiRemoteService apiRemoteService, ApiParam param) {
 
-        List<Api1108> items = api1108Rep.findPushData(param.getKqdm());
+        List<Api1108> items = api1108Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
             return;
         }
@@ -261,7 +261,7 @@
      */
     public void pushData1110(ApiRemoteService apiRemoteService, ApiParam param) {
 
-        List<Api1110> items = api1110Rep.findPushData(param.getKqdm());
+        List<Api1110> items = api1110Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
             return;
         }
@@ -288,7 +288,7 @@
      */
     public void pushData1111(ApiRemoteService apiRemoteService, ApiParam param) {
 
-        List<Api1111> items = api1111Rep.findPushData(param.getKqdm());
+        List<Api1111> items = api1111Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
             return;
         }
@@ -315,7 +315,7 @@
      */
     public void pushData1112(ApiRemoteService apiRemoteService, ApiParam param) {
 
-        List<Api1112> items = api1112Rep.findPushData(param.getKqdm());
+        List<Api1112> items = api1112Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
             return;
         }
@@ -335,4 +335,32 @@
             }
         }
     }
+
+    /**
+     * 1113 浼佷笟淇$敤淇℃伅
+     *
+     */
+    public void pushData1113(ApiRemoteService apiRemoteService, ApiParam param) {
+
+        List<Api1113> items = api1113Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+        if (null == items || items.isEmpty()) {
+            return;
+        }
+
+        param.setInteCategory(Constant.API_CATEGORY_11);
+        param.setInteId(Constant.API_CODE_1113);
+
+        ResponseDto responseDto;
+        for (Api1113 data : items) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+
+            if (responseDto.getSuccess() == 0) {
+                if (Constant.CZBZ_I.equals(data.getCzbz())) {
+                    data.setCzbz("u");
+                    api1113Rep.save(data);
+                }
+            }
+        }
+    }
 }

--
Gitblit v1.9.3