From 9f6dacf7b39e5aeba37d8faf575c9e56d8cbe51a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 11 十月 2025 13:35:42 +0800
Subject: [PATCH] 武汉黄陂军粮-质检报告共享接口同步及推送

---
 src/main/java/com/fzzy/api/timer/SyncDataScheduled.java |  124 ++++++++++++++++++++--------------------
 1 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java b/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
index 1b5d45f..e4131f9 100644
--- a/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
+++ b/src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
@@ -36,8 +36,7 @@
      * <p>
      * 鍥哄畾鏃堕棿锛�0鍒嗛挓鍜�30鍒嗛挓鎵ц
      */
-//    @Scheduled(cron = "0 0,30 * * * ? ")
-    @Scheduled(cron = "0 * * * * ? ")
+    @Scheduled(cron = "0 0,30 * * * ? ")
     public void scheduled() {
 
         log.info("绯荤粺鎵ц瀹氭椂鏁版嵁鍚屾鎿嶄綔<<<<<<<<<<<<<--------");
@@ -73,66 +72,67 @@
 
         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;
-//
-//                //寮�濮嬫椂闂存彁鍓�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;
-//        }
+        //鏄惁鎵ц
+        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.getSyncDay99())) {
+                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.getSyncHour99())) {
+                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, -2);
+            }
+        } else {
+            isExecute = false;
+        }
+
+        if (!isExecute) {
+            log.debug("涓氬姟鏁版嵁鍚屾---鏃堕棿閰嶇疆鍒嗛挓涓嶅尮閰�<<<<<<<<<<<<<-------");
+            return;
+        }
 
         log.debug("涓氬姟鏁版嵁鍚屾---寮�濮嬫煡璇笟鍔℃暟鎹繘琛屽悓姝�<<<<<<<<<<<<<-------");
         ApiParam param = new ApiParam();

--
Gitblit v1.9.3