From 82723ea5ecc5dd0e197d544a61bcfe86f63692a3 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 02 三月 2024 16:08:44 +0800
Subject: [PATCH] 解决数据定时同步及上报不执行问题

---
 src/main/java/com/fzzy/api/timer/PushDataScheduled.java |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/fzzy/api/timer/PushDataScheduled.java b/src/main/java/com/fzzy/api/timer/PushDataScheduled.java
index 5dc67d9..e907a1d 100644
--- a/src/main/java/com/fzzy/api/timer/PushDataScheduled.java
+++ b/src/main/java/com/fzzy/api/timer/PushDataScheduled.java
@@ -81,7 +81,7 @@
             isExecute = true;
         } else {
             int dayOfWeek = ContextUtil.getDayOfWeek(exeDate);
-            if (String.valueOf(dayOfWeek).equals(conf.getPushDay11())) {
+            if (String.valueOf(dayOfWeek).equals(conf.getPushDay99())) {
                 isExecute = true;
 
                 //寮�濮嬫椂闂存彁鍓�7澶�
@@ -97,6 +97,43 @@
             return;
         }
 
+        //鏍稿鏃堕棿鏄惁鍖归厤
+        if (conf.getPushHour99().equals(ApiConfs.TIME_ALL)) {
+            isExecute = true;
+        } else {
+            int hourOfDay = ContextUtil.getHourOfDay(exeDate);
+            if (String.valueOf(hourOfDay).equals(conf.getPushHour99())) {
+                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());

--
Gitblit v1.9.3