From 151ba81e92c3c60888cbc04b1a4f3276b8111ac6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 05 七月 2025 09:03:09 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/NotifyScheduler.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/NotifyScheduler.java b/src/main/java/com/zy/asrs/task/NotifyScheduler.java
index 601d9aa..675e9ce 100644
--- a/src/main/java/com/zy/asrs/task/NotifyScheduler.java
+++ b/src/main/java/com/zy/asrs/task/NotifyScheduler.java
@@ -18,6 +18,7 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 
 @Component
@@ -47,7 +48,12 @@
         }
     }
 
-    private synchronized void notifyMsg(String deviceType, Integer device) {
+    @Scheduled(cron = "0/3 * * * * ? ")
+    public synchronized void notifyTask(){
+        notifyMsg("task", 1);
+    }
+
+    private synchronized void notifyMsg(String notifyType, Integer device) {
         Config notifyEnableConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "notifyEnable"));
         if(notifyEnableConfig == null){
             return;
@@ -69,7 +75,7 @@
         }
         String notifyUriPath = notifyUriPathConfig.getValue();
 
-        List<String> keys = notifyUtils.takeKeys(deviceType, device);
+        List<String> keys = notifyUtils.takeKeys(notifyType, device);
         if(keys == null){
             return;
         }
@@ -89,6 +95,11 @@
                 continue;
             }
 
+//            HttpRequestLog httpRequestLog = new HttpRequestLog();
+//            httpRequestLog.setName(notifyUri + notifyUriPath);
+//            httpRequestLog.setRequest(JSON.toJSONString(notifyDto));
+//            httpRequestLog.setCreateTime(new Date());
+
             try {
                 //瑙﹀彂閫氱煡
                 String response = new HttpHandler.Builder()
@@ -97,15 +108,21 @@
                         .setJson(JSON.toJSONString(notifyDto))
                         .build()
                         .doPost();
+//                httpRequestLog.setResponse(response);
+
                 JSONObject jsonObject = JSON.parseObject(response);
                 Integer code = jsonObject.getInteger("code");
                 if(code == 200){
                     //閫氱煡鎴愬姛
                     redisUtil.del(key);
-                    return;
+
+                    continue;
                 }
             }catch (Exception e){
                 e.printStackTrace();
+            }finally {
+                //淇濆瓨璁板綍
+//                httpRequestLogService.insert(httpRequestLog);
             }
 
             //閫氱煡澶辫触
@@ -113,13 +130,13 @@
             if (times >= notifyDto.getFailTimes()) {
                 //瓒呰繃娆℃暟
                 redisUtil.del(key);
-                return;
+                continue;
             }
 
             notifyDto.setLastRetryTime(System.currentTimeMillis());
             notifyDto.setRetryTimes(times);
             redisUtil.set(key, notifyDto);
-            return;
+            continue;
         }
     }
 

--
Gitblit v1.9.1