From dbdb7145c35988d192f584be19aba8207ade6fa4 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 24 Jul 2024 19:14:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E9=87=8D=E8=AF=95=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84=E8=AE=B0=E5=BD=95=E6=97=B6=E9=97=B4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhgd/xmgl/task/HikvisionTask.java     | 66 +++++++++++--------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java b/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java
index f3330b3d5..c3cb89c8b 100644
--- a/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java
@@ -131,21 +131,25 @@ public class HikvisionTask {
     @SchedulerLock(name = "retrySyncHikvisionTenMin", lockAtMostFor = 1000 * 30, lockAtLeastFor = 1000 * 30)
     @Scheduled(cron = "0 */10 * * * ?")
     @RequestMapping("retrySyncHikvisionTenMin")
-    public void retrySyncHikvisionTenMin() throws Exception {
-        HashMap<String, Object> newListMap = new HashMap<>(16);
-        newListMap.put("isSuccess", 0);
-        newListMap.put("createDateBegin", DateUtil.formatDateTime(DateUtil.offsetHour(new Date(), -1)));
-        newListMap.put("geBeforeTenMin", 1);
-        List<XzHikvisionSync> newestList = xzHikvisionSyncService.getNewestList(newListMap);
-        for (XzHikvisionSync xzHikvisionSync : newestList) {
-            log.info("海康同步的定时重试失败的记录，id:{}", xzHikvisionSync.getId());
-            HashMap<String, Object> retryMap = new HashMap<>(16);
-            retryMap.put("id", xzHikvisionSync.getId());
-            try {
-                xzHikvisionSyncService.retry(retryMap);
-            } catch (Exception e) {
-                log.error("海康同步的定时重试失败的记录:error:", e);
+    public void retrySyncHikvisionTenMin() {
+        try {
+            HashMap<String, Object> newListMap = new HashMap<>(16);
+            newListMap.put("isSuccess", 0);
+            newListMap.put("createDateBegin", DateUtil.formatDateTime(DateUtil.offsetHour(new Date(), -1)));
+            newListMap.put("geBeforeTenMin", 1);
+            List<XzHikvisionSync> newestList = xzHikvisionSyncService.getNewestList(newListMap);
+            for (XzHikvisionSync xzHikvisionSync : newestList) {
+                log.info("海康同步的定时重试失败的记录，id:{}", xzHikvisionSync.getId());
+                HashMap<String, Object> retryMap = new HashMap<>(16);
+                retryMap.put("id", xzHikvisionSync.getId());
+                try {
+                    xzHikvisionSyncService.retry(retryMap);
+                } catch (Exception e) {
+                    log.error("海康同步的定时重试失败的记录:error:", e);
+                }
             }
+        } catch (Exception e) {
+            log.error("定时重试失败的记录，十分钟一次，出现错误" + e);
         }
     }
 
@@ -153,23 +157,27 @@ public class HikvisionTask {
      * 定时重试失败的记录，一小时一次
      */
     @SchedulerLock(name = "retrySyncHikvisionHourly", lockAtMostFor = 1000 * 30, lockAtLeastFor = 1000 * 30)
-    @Scheduled(cron = "0 */10 * * * ?")
+    @Scheduled(cron = "0 0 0/1 * * ?")
     @RequestMapping("retrySyncHikvisionHourly")
-    public void retrySyncHikvisionHourly() throws Exception {
-        HashMap<String, Object> newListMap = new HashMap<>(16);
-        newListMap.put("isSuccess", 0);
-        newListMap.put("createDateBegin", DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)));
-        newListMap.put("geBeforeHour", 1);
-        List<XzHikvisionSync> newestList = xzHikvisionSyncService.getNewestList(newListMap);
-        for (XzHikvisionSync xzHikvisionSync : newestList) {
-            log.info("海康同步的定时重试失败的记录，id:{}", xzHikvisionSync.getId());
-            HashMap<String, Object> retryMap = new HashMap<>(16);
-            retryMap.put("id", xzHikvisionSync.getId());
-            try {
-                xzHikvisionSyncService.retry(retryMap);
-            } catch (Exception e) {
-                log.error("海康同步的定时重试失败的记录:error:", e);
+    public void retrySyncHikvisionHourly() {
+        try {
+            HashMap<String, Object> newListMap = new HashMap<>(16);
+            newListMap.put("isSuccess", 0);
+            newListMap.put("createDateBegin", DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)));
+            newListMap.put("geBeforeHour", 1);
+            List<XzHikvisionSync> newestList = xzHikvisionSyncService.getNewestList(newListMap);
+            for (XzHikvisionSync xzHikvisionSync : newestList) {
+                log.info("海康同步的定时重试失败的记录，id:{}", xzHikvisionSync.getId());
+                HashMap<String, Object> retryMap = new HashMap<>(16);
+                retryMap.put("id", xzHikvisionSync.getId());
+                try {
+                    xzHikvisionSyncService.retry(retryMap);
+                } catch (Exception e) {
+                    log.error("海康同步的定时重试失败的记录:error:", e);
+                }
             }
+        } catch (Exception e) {
+            log.error("定时重试失败的记录，一小时一次" + e);
         }
     }