From d4c8d8c629a08b392c185ff5fa34a6d4e46e1d4d Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 01 七月 2023 13:26:07 +0800
Subject: [PATCH] 雷达历史查询按时间倒序

---
 ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
index 3f43366..659afcc 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
@@ -1,5 +1,6 @@
 package com.ruoyi.alarm.globalAlarm.service.impl;
 
+import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
 import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
 import com.ruoyi.alarm.radarAlarm.domain.ArdAlarmRadar;
 import com.ruoyi.alarm.radarAlarm.service.IArdAlarmRadarService;
@@ -22,7 +23,7 @@
  */
 
 @Component
-@Slf4j
+@Slf4j(topic = "guideQueue")
 public class QueueTaskExecutor {
     @Resource
     IHikClientService hikClientService;
@@ -35,13 +36,24 @@
         try {
             CameraCmd cmd = new CameraCmd();
             cmd.setCameraId(guideTask.getCameraId());
-            cmd.setChannelNum(guideTask.getNum());
+            cmd.setChannelNum(guideTask.getChanNum());
+            cmd.setTargetPosition(guideTask.getTargetPosition());
+            cmd.setOperator(guideTask.getAlarmType());
+            cmd.setExpired(30);
+            cmd.setRecordBucketName("record");
+            cmd.setRecordObjectName("alarm");
+            log.debug("寮�濮嬪紩瀵�");
             boolean guideRes = hikClientService.guideTargetPosition(cmd);
             if (guideRes) {
+                log.debug("寮曞鎴愬姛");
                 hikClientService.controlLock(cmd);//涓婇攣
                 cmd.setEnable(true);//寮�濮嬪綍鍍�
                 hikClientService.recordToMinio(cmd);//寮�濮嬪綍鍍�
-                Thread.sleep(30000);
+                try {
+                    Thread.sleep(30000);
+                } catch (InterruptedException e) {
+                    log.info("褰撳墠浠诲姟ID"+guideTask.getAlarmId()+"绾跨▼琚粓姝�");
+                }
                 cmd.setEnable(false);//鍋滄褰曞儚
                 cmd.setUploadMinio(true);//涓婁紶minio
                 String url = hikClientService.recordToMinio(cmd);//鍋滄褰曞儚杩斿洖url
@@ -77,7 +89,7 @@
                 }
             }
         } catch (Exception ex) {
-            log.info("鑷姩寮曞寮傚父:" + ex.getMessage());
+            log.info("绾跨▼浠诲姟寮傚父:" + ex.getMessage());
         }
     }
 }

--
Gitblit v1.9.3