From f3d2007e78e8df1064ee7a3b4b9b4c790717fba7 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 22 四月 2024 16:09:33 +0800
Subject: [PATCH] 调整广东省平台市局推送-增加指令推送,测试使用

---
 src/main/java/com/fzzy/push/impl/ComPushService11.java |  134 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 121 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/fzzy/push/impl/ComPushService11.java b/src/main/java/com/fzzy/push/impl/ComPushService11.java
index 20b66af..4a0ca1d 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService11.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService11.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;
 
@@ -16,6 +17,7 @@
  * @author: andy.jia
  * @update-time: 2022/10/28 2:02
  */
+@Slf4j
 @Service
 public class ComPushService11 {
 
@@ -43,6 +45,12 @@
     private Api1112Rep api1112Rep;
     @Autowired
     private Api1113Rep api1113Rep;
+    @Autowired
+    private Api1501Rep api1501Rep;
+    @Autowired
+    private Api1502Rep api1502Rep;
+    @Autowired
+    private Api1503Rep api1503Rep;
     /**
      * 1101 鍗曚綅淇℃伅
      */
@@ -50,8 +58,10 @@
 
         List<Api1101> items = api1101Rep.getDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
+            log.error("-----鏈幏鍙栧埌鍗曚綅淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
+
 
         param.setInteCategory(Constant.API_CATEGORY_11);
         param.setInteId(Constant.API_CODE_1101);
@@ -76,6 +86,7 @@
 
         List<Api1102> items = api1102Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
+            log.error("-----鏈幏鍙栧埌搴撳尯淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
 
@@ -102,6 +113,7 @@
 
         List<Api1103> items = api1103Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
+            log.error("-----鏈幏鍙栧埌浠撴埧淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
 
@@ -115,8 +127,7 @@
 
             if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
-                    data.setCzbz("u");
-                    api1103Rep.save(data);
+                    api1103Rep.updateStatus(data.getCfdm(), Constant.CZBZ_U);
                 }
             }
         }
@@ -129,6 +140,7 @@
 
         List<Api1104> items = api1104Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
+            log.error("-----鏈幏鍙栧埌寤掗棿淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
 
@@ -142,8 +154,7 @@
 
             if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
-                    data.setCzbz("u");
-                    api1104Rep.save(data);
+                    api1104Rep.updateStatus(data.getAjdh(), Constant.CZBZ_U);
                 }
             }
         }
@@ -156,6 +167,7 @@
 
         List<Api1105> items = api1105Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
+            log.error("-----鏈幏鍙栧埌璐т綅淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
 
@@ -169,8 +181,7 @@
 
             if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
-                    data.setCzbz("u");
-                    api1105Rep.save(data);
+                    api1105Rep.updateStatus(data.getHwdm(), Constant.CZBZ_U);
                 }
             }
         }
@@ -183,6 +194,7 @@
 
         List<Api1106> items = api1106Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
+            log.error("-----鏈幏鍙栧埌娌圭綈淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
 
@@ -196,8 +208,7 @@
 
             if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
-                    data.setCzbz("u");
-                    api1106Rep.save(data);
+                    api1106Rep.updateStatus(data.getYgdm(), Constant.CZBZ_U);
                 }
             }
         }
@@ -210,6 +221,7 @@
 
         List<Api1107> items = api1107Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
+            log.error("-----鏈幏鍙栧埌璁惧淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
 
@@ -223,7 +235,7 @@
 
             if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
-                    api1107Rep.updateStatus(data.getDwdm(), Constant.CZBZ_U);
+                    api1107Rep.updateStatus(data.getSbbh(), Constant.CZBZ_U);
                 }
             }
         }
@@ -236,6 +248,7 @@
 
         List<Api1108> items = api1108Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
+            log.error("-----鏈幏鍙栧埌鑽墏淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
 
@@ -249,8 +262,7 @@
 
             if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
-                    data.setCzbz("u");
-                    api1108Rep.save(data);
+                    api1108Rep.updateStatus(data.getId(), Constant.CZBZ_U);
                 }
             }
         }
@@ -263,6 +275,7 @@
 
         List<Api1110> items = api1110Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
+            log.error("-----鏈幏鍙栧埌搴撳尯鍥句粨鎴跨偣浣嶆爣娉紝涓嶆帹閫�-----");
             return;
         }
 
@@ -276,8 +289,7 @@
 
             if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
-                    data.setCzbz("u");
-                    api1110Rep.save(data);
+                    api1110Rep.updateStatus(data.getHwdm(), Constant.CZBZ_U);
                 }
             }
         }
@@ -290,6 +302,7 @@
 
         List<Api1111> items = api1111Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
+            log.error("-----鏈幏鍙栧埌搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉紝涓嶆帹閫�-----");
             return;
         }
 
@@ -317,6 +330,7 @@
 
         List<Api1112> items = api1112Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
+            log.error("-----鏈幏鍙栧埌浜哄憳淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
 
@@ -344,6 +358,7 @@
 
         List<Api1113> items = api1113Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
         if (null == items || items.isEmpty()) {
+            log.error("-----鏈幏鍙栧埌浼佷笟淇$敤淇℃伅锛屼笉鎺ㄩ��-----");
             return;
         }
 
@@ -363,4 +378,97 @@
             }
         }
     }
+
+    /**
+     * 璐㈠姟鎶ヨ〃
+     * @param apiRemoteService
+     * @param param
+     */
+    public void pushData1114(ApiRemoteService apiRemoteService, ApiParam param) {
+        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("-----鏈幏鍙栧埌璧勪骇璐熷�轰俊鎭紝涓嶆帹閫�-----");
+            return;
+        }
+        param.setInteCategory(Constant.API_CATEGORY_11);
+        param.setInteId(Constant.API_CODE_1114_1501);
+        ResponseDto responseDto;
+        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("-----鏈幏鍙栧埌鐜伴噾娴佷俊鎭紝涓嶆帹閫�-----");
+            return;
+        }
+        param.setInteCategory(Constant.API_CATEGORY_11);
+        param.setInteId(Constant.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("-----鏈幏鍙栧埌鍒╂鼎淇℃伅锛屼笉鎺ㄩ��-----");
+            return;
+        }
+        param.setInteCategory(Constant.API_CATEGORY_11);
+        param.setInteId(Constant.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