From 44ef24375d57b7bf38369aa8de83605e800460d9 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 周二, 30 5月 2023 14:20:30 +0800
Subject: [PATCH] 提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PatrolInspectionTask.java | 16 ++++++++++++----
ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java | 12 ++++++------
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java | 1 +
3 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
index 0543950..5c9c6fc 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
@@ -589,6 +589,7 @@
}
@Override
+ @SdkOperate
public boolean setTargetPosition(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getChannelNum();
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java
index fac9d06..a3d1c64 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java
@@ -32,11 +32,11 @@
/** 排序 */
@Excel(name = "排序")
- private String orderNumber;
+ private Integer orderNumber;
/** 录制时间 */
@Excel(name = "录制时间")
- private String recordingTime;
+ private Integer recordingTime;
/** 井id */
@Excel(name = "井id")
@@ -78,21 +78,21 @@
{
return id;
}
- public void setOrderNumber(String orderNumber)
+ public void setOrderNumber(Integer orderNumber)
{
this.orderNumber = orderNumber;
}
- public String getOrderNumber()
+ public Integer getOrderNumber()
{
return orderNumber;
}
- public void setRecordingTime(String recordingTime)
+ public void setRecordingTime(Integer recordingTime)
{
this.recordingTime = recordingTime;
}
- public String getRecordingTime()
+ public Integer getRecordingTime()
{
return recordingTime;
}
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 75aeef6..279dc10 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
@@ -8,8 +8,10 @@
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.hiksdk.service.IHikClientService;
+import com.ruoyi.inspect.domain.ArdVideoInspectRecord;
import com.ruoyi.inspect.domain.ArdVideoInspectTask;
import com.ruoyi.inspect.domain.ArdVideoInspectTaskStep;
+import com.ruoyi.inspect.service.IArdVideoInspectRecordService;
import com.ruoyi.inspect.service.IArdVideoInspectTaskService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -33,7 +35,8 @@
IArdVideoInspectTaskService ardVideoInspectTaskService;
@Resource
IArdAlarmpointsWellService ardAlarmpointsWellService;
-
+ @Resource
+ IArdVideoInspectRecordService ardVideoInspectRecordService;
@Resource
IArdCamerasService ardCamerasService;
@Resource
@@ -105,7 +108,7 @@
.map(ArdVideoInspectTaskStep::getRecordingTime)
.findFirst();
if (recordingTime.isPresent()) {
- System.out.println("找到了匹配的对象，名称为: " + recordingTime.get());
+ System.out.println("找到了匹配的recordingTime: " + recordingTime.get());
/*获取到当前步骤的持续时间*/
Date currentStepStartDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStartTime);
Date currentStepStopDate = DateUtils.addMinutes(currentStepStartDate,recordingTime.get());
@@ -120,11 +123,16 @@
cmd.setEnable(false);//停止录像
String record = hikClientService.record(cmd);
/*更新巡检记录*/
-
+ ArdVideoInspectRecord ardVideoInspectRecord=new ArdVideoInspectRecord();
+ ardVideoInspectRecord.setStepId(currentStepId);
+ ardVideoInspectRecord.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,currentStepStartDate));
+ ardVideoInspectRecord.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,currentStepStopDate));
+ ardVideoInspectRecord.setRecordFilePath(record);
+ ardVideoInspectRecordService.insertArdVideoInspectRecord(ardVideoInspectRecord);
log.info(record);
}
} else {
- System.out.println("未找到匹配的对象");
+ System.out.println("未找到匹配的recordingTime");
}
}
--
Gitblit v1.9.3