From cf746a1b31ddd2b2b4232c5ce9dd304a2d5c2c46 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 02 八月 2023 10:32:53 +0800
Subject: [PATCH] 单兵端-新任务轮询异常修复

---
 ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
index 68386dd..4c32163 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
@@ -6,6 +6,7 @@
 import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
 import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.device.camera.domain.ArdCameras;
 import com.ruoyi.device.camera.domain.CameraCmd;
 import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
@@ -453,8 +454,7 @@
                     boolean setTargetPosition = hikClientService.guideTargetPosition(cmd);
                     if (setTargetPosition) {
                         /*鎺у埗鐩告満宸℃鎴愬姛锛屽紑濮嬪綍鍍�*/
-                        cmd.setEnable(true);//鍚姩褰曞儚
-                        hikClientService.recordToMinio(cmd);
+                        hikClientService.recordStart(cmd);
                     } else {
                         /*鎺у埗澶辫触,褰撳墠姝ラ鍚姩鏃堕棿缃畁ull*/
                         ardVideoInspectTask.setCurrentStepStartTime("");
@@ -509,6 +509,10 @@
                         ardVideoInspectTask.setCurrentStepStartTime("");
                         ardVideoInspectTaskMapper.updateArdVideoInspectTaskWithCurrentSetpInfo(ardVideoInspectTask);
                     }
+                    else
+                    {
+                        log.debug("寮曞鎴愬姛!");
+                    }
                 }
             }
         } catch (Exception ex) {
@@ -537,11 +541,9 @@
                 cmd.setCameraId(cameraId);
                 cmd.setChannelNum(channel);
                 cmd.setOperator("sys_patrol_inspect");
-                cmd.setEnable(false);//鍋滄褰曞儚
                 cmd.setRecordBucketName("record");
-                cmd.setRecordObjectName("inspect");
-                cmd.setUploadMinio(true);
-                String url=  hikClientService.recordToMinio(cmd);
+                cmd.setRecordObjectName("inspect_"+ IdUtils.fastSimpleUUID());
+                String url=  hikClientService.recordStopToMinio(cmd);
                 /*鎻掑叆宸℃璁板綍*/
                 ArdVideoInspectRecord ardVideoInspectRecord = new ArdVideoInspectRecord();
                 ardVideoInspectRecord.setStepId(step.getId());

--
Gitblit v1.9.3