From 757f7e5256ef3cd48cb7887f4e1f8fd4ecff1b14 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 12 六月 2023 15:31:23 +0800
Subject: [PATCH] 修复sdk错误码56的错误 相机登录修改为异步登录
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PatrolInspectionTask.java | 127 ++----------------------------------------
1 files changed, 7 insertions(+), 120 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 fb9b1c0..542133a 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
@@ -16,10 +16,11 @@
import com.ruoyi.inspect.service.IArdVideoInspectTaskService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
+
import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* @Description: 宸℃浠诲姟
@@ -34,123 +35,9 @@
@Resource
IArdVideoInspectTaskService ardVideoInspectTaskService;
- @Resource
- IArdAlarmpointsWellService ardAlarmpointsWellService;
- @Resource
- IArdVideoInspectRecordService ardVideoInspectRecordService;
- @Resource
- IArdCamerasService ardCamerasService;
- @Resource
- IHikClientService hikClientService;
- public void scanRun() throws IOException {
- /*鎵弿鎵�鏈夊彲鎵ц浠诲姟1-鏃堕棿婊¤冻2-鑷姩*/
- log.info("寮�濮嬫壂鎻忔墍鏈夊彲鎵ц浠诲姟");
- ArdVideoInspectTask ardVideoInspectTask = new ArdVideoInspectTask();
- ardVideoInspectTask.setInspectMode("鑷姩");
- List<ArdVideoInspectTask> ardVideoInspectTasks = ardVideoInspectTaskService.selectArdVideoInspectTaskList(ardVideoInspectTask);
- for (ArdVideoInspectTask videoInspectTask : ardVideoInspectTasks) {
- /*閬嶅巻鎵�鏈夋椂闂存弧瓒崇殑鑷姩浠诲姟*/
- boolean timeCompare = DateUtils.TimeCompare(videoInspectTask.getStartTime(), videoInspectTask.getEndTime());
- if (timeCompare) {
- log.info("婊¤冻鏃堕棿");
- /*褰撳墠浠诲姟鐨勫贰妫�姝ラ*/
- List<ArdVideoInspectTaskStep> ardVideoInspectTaskStepList = ardVideoInspectTaskService.selectArdVideoInspectTaskById(videoInspectTask.getId()).getArdVideoInspectTaskStepList();
- Integer setpNum=ardVideoInspectTaskStepList.size();//姝ラ鏁伴噺
- /*鑾峰彇褰撳墠浠诲姟姝ｅ湪鎵ц鐨勬楠ゅ拰褰撳墠姝ラ寮�濮嬬殑鏃堕棿*/
- String currentStepId = videoInspectTask.getCurrentStepId();
- String cameraId = videoInspectTask.getCameraId();
- Integer channel = videoInspectTask.getChannel();
- String currentStepStartTime = videoInspectTask.getCurrentStepStartTime();
- /*濡傛灉褰撳墠姝ラ鏈壘鍒帮紝鍒欎粠1寮�濮�*/
- if (StringUtils.isNull(currentStepId)) {
- String wellId = ardVideoInspectTaskStepList.get(0).getWellId();//鑾峰彇绗竴涓楠ょ殑浜曞彿
- if (!StringUtils.isNull(wellId)) {
- /*鑾峰彇浜曞潗鏍�*/
- ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellService.selectArdAlarmpointsWellById(wellId);
- double[] targetPositon = new double[3];
- targetPositon[0]=ardAlarmpointsWell.getLongitude();
- targetPositon[1]=ardAlarmpointsWell.getLatitude();
- targetPositon[2]=ardAlarmpointsWell.getAltitude();
- /*鑾峰彇鐩告満鍧愭爣*/
- ArdCameras cameras = ardCamerasService.selectArdCamerasById(cameraId);
- double[] cameraPositon = new double[3];
- cameraPositon[0]=cameras.getLongitude();
- cameraPositon[1]=cameras.getLatitude();
- cameraPositon[2]=cameras.getAltitude();
- /*鎺у埗鐩告満宸℃*/
- CameraCmd cmd = new CameraCmd();
- cmd.setCameraId(cameraId);
- cmd.setChannelNum(channel);
- cmd.setCamPosition(cameraPositon);
- cmd.setTargetPosition(targetPositon);
- cmd.setOperator("sys_patrol_inspect");
- cmd.setExpired(ardVideoInspectTaskStepList.get(0).getRecordingTime());
- boolean setTargetPosition = hikClientService.setTargetPosition(cmd);
- if(setTargetPosition)
- {
- /*鎺у埗鐩告満宸℃鎴愬姛锛屽紑濮嬪綍鍍�*/
- cmd.setEnable(true);//鍚姩褰曞儚
- hikClientService.recordToMinio(cmd);
- /*鏇存柊浠诲姟褰撳墠姝ラid鍜屾楠ゅ惎鍔ㄦ椂闂�*/
- ArdVideoInspectTask avit=new ArdVideoInspectTask();
- avit.setId(videoInspectTask.getId());
- avit.setCurrentStepId(ardVideoInspectTaskStepList.get(0).getId());
- avit.setCurrentStepStartTime(DateUtils.getTime());
- //TODO with int i = ardVideoInspectTaskService.updateArdVideoInspectTaskWithCurrentStepInfo(avit);
- // log.info("鏇存柊缁撴灉"+i);
- }
- }
- }
- else /*褰撳墠浠诲姟宸茬粡鎵ц锛屽垽鏂槸鍚﹀埌鏈�*/
- {
- Optional<Integer> recordingTime = ardVideoInspectTaskStepList.stream()
- .filter(ardVideoInspectTaskStep -> ardVideoInspectTaskStep.getId().equals(currentStepId))
- .map(ArdVideoInspectTaskStep::getRecordingTime)
- .findFirst();
- if (recordingTime.isPresent()) {
- 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());
- /*鍒ゆ柇鏃堕棿鏄惁杩囨湡*/
- if(!DateUtils.TimeCompare(currentStepStartDate,currentStepStopDate))
- {
- /*宸茶繃鏈�,鍋滄褰曞儚锛屾墽琛屼笅涓�姝ラ*/
- CameraCmd cmd = new CameraCmd();
- cmd.setCameraId(cameraId);
- cmd.setChannelNum(channel);
- cmd.setOperator("sys_patrol_inspect");
- cmd.setEnable(false);//鍋滄褰曞儚
- 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);
- 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("鏈壘鍒板尮閰嶇殑recordingTime");
- }
-
- }
- /*鍚﹀垯鍒ゆ柇褰撳墠姝ラ寮�濮嬫椂闂达紝鍒ゆ柇鏄惁鍒版湡*/
- /*鏈埌鏈�*/
- /*蹇界暐*/
- /*宸插埌鏈�*/
- /*缁撴潫褰曞儚锛岃浆鍒颁笅涓�涓楠わ紝
- 鎺у埗浜戝彴鎸囧悜鍏宠仈浜曞潗鏍囷紝骞跺紑濮嬪綍鍍忥紝鏇存柊褰撳墠姝ラ鍜屽綋鍓嶆楠ゅ紑濮嬫椂闂�/
- */
- }
- }
+ //宸℃浠诲姟
+ public void scanRun() {
+ ardVideoInspectTaskService.autoTaskRun();
}
}
--
Gitblit v1.9.3