From 3280739f26b778b59e2588d8f08012c31f79174b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 31 五月 2023 10:51:55 +0800
Subject: [PATCH] 提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PatrolInspectionTask.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PatrolInspectionTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PatrolInspectionTask.java
index 279dc10..ec09940 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PatrolInspectionTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PatrolInspectionTask.java
@@ -7,6 +7,7 @@
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
+import com.ruoyi.device.hiksdk.config.MinioClientSingleton;
import com.ruoyi.device.hiksdk.service.IHikClientService;
import com.ruoyi.inspect.domain.ArdVideoInspectRecord;
import com.ruoyi.inspect.domain.ArdVideoInspectTask;
@@ -42,7 +43,7 @@
@Resource
IHikClientService hikClientService;
- public void scanRun() {
+ public void scanRun(){
/*鎵弿鎵�鏈夊彲鎵ц浠诲姟1-鏃堕棿婊¤冻2-鑷姩*/
log.info("寮�濮嬫壂鎻忔墍鏈夊彲鎵ц浠诲姟");
ArdVideoInspectTask ardVideoInspectTask = new ArdVideoInspectTask();
@@ -90,7 +91,7 @@
{
/*鎺у埗鐩告満宸℃鎴愬姛锛屽紑濮嬪綍鍍�*/
cmd.setEnable(true);//鍚姩褰曞儚
- hikClientService.record(cmd);
+ hikClientService.recordToMinio(cmd);
/*鏇存柊浠诲姟褰撳墠姝ラid鍜屾楠ゅ惎鍔ㄦ椂闂�*/
ArdVideoInspectTask avit=new ArdVideoInspectTask();
avit.setId(videoInspectTask.getId());
@@ -121,7 +122,13 @@
cmd.setChannelNum(channel);
cmd.setOperator("sys_patrol_inspect");
cmd.setEnable(false);//鍋滄褰曞儚
- String record = hikClientService.record(cmd);
+ String uuid = UUID.randomUUID().toString().replace("-", "");
+ String time = new SimpleDateFormat("yyyyMMdd").format(new Date());
+ String recordName = cameraId + "/" + time + "/" + uuid + ".mp4";
+ cmd.setRecordBucketName("record");
+ cmd.setRecordObjectName(recordName);
+ String url= MinioClientSingleton.domainUrl+ "/" +cmd.getRecordBucketName()+ "/"+recordName;
+ hikClientService.recordToMinio(cmd);
/*鏇存柊宸℃璁板綍*/
ArdVideoInspectRecord ardVideoInspectRecord=new ArdVideoInspectRecord();
ardVideoInspectRecord.setStepId(currentStepId);
--
Gitblit v1.9.3