From bfebb3257d57c7b1906a09ac3b76af1bc9e62d25 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 09 三月 2024 17:18:58 +0800
Subject: [PATCH] 优化sdk日志 关闭定时任务日志remark不为空开启日志写入
---
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 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 1c4cb8b..890016e 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
@@ -436,28 +436,36 @@
if (!StringUtils.isNull(wellId)) {
/*鑾峰彇浜曞潗鏍�*/
ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);
+ if(StringUtils.isNull(well))
+ {
+ log.debug("鎵句笉鍒颁簳:" + well.getWellId());
+ return;
+ }
+ log.debug("鎵惧埌浜�:" + well.getWellId());
double[] targetPositon = new double[3];
targetPositon[0] = well.getLongitude();
targetPositon[1] = well.getLatitude();
- targetPositon[2] = well.getAltitude();
+ //targetPositon[2] = well.getAltitude();
+ log.debug("鎵惧埌浜曞潗鏍�:" +well.getLongitude()+"-"+well.getLatitude()+"-"+well.getAltitude());
/*鑾峰彇鐩告満鍧愭爣*/
ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId);
if (StringUtils.isNull(cameras)) {
log.debug("鎵句笉鍒扮浉鏈�:" + cameraId);
return;
}
- double[] cameraPositon = new double[3];
- cameraPositon[0] = cameras.getLongitude();
- cameraPositon[1] = cameras.getLatitude();
- cameraPositon[2] = cameras.getAltitude();
+ log.debug("鎵惧埌鐩告満:" + 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.setChanNo(channel);
cmd.setTargetPosition(targetPositon);
cmd.setOperator("sys_patrol_inspect");
- cmd.setExpired(step.getRecordingTime() * 60);
-
+ cmd.setExpired(step.getRecordingTime());//绉掍负鍗曚綅
boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);
if (setTargetPosition) {
/*鎺у埗鐩告満宸℃鎴愬姛锛屽紑濮嬪綍鍍�*/
@@ -494,10 +502,10 @@
if (!StringUtils.isNull(wellId)) {
/*鑾峰彇浜曞潗鏍�*/
ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);
- double[] targetPositon = new double[3];
+ double[] targetPositon = new double[2];
targetPositon[0] = well.getLongitude();
targetPositon[1] = well.getLatitude();
- targetPositon[2] = well.getAltitude();
+ //targetPositon[2] = well.getAltitude();
/*鑾峰彇鐩告満鍧愭爣*/
ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId);
if (StringUtils.isNull(cameras)) {
@@ -514,7 +522,7 @@
cmd.setChanNo(channel);
cmd.setTargetPosition(targetPositon);
cmd.setOperator("sys_patrol_inspect");
- cmd.setExpired(step.getRecordingTime() * 60);
+ cmd.setExpired(step.getRecordingTime());//绉掍负鍗曚綅
boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);
if (!setTargetPosition) {
/*鎺у埗澶辫触,褰撳墠姝ラ鍚姩鏃堕棿缃畁ull*/
@@ -564,7 +572,7 @@
ardVideoInspectRecord.setWellName(ardAlarmpointsWell.getWellId());
}
Date currentStepStartDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStartTime);
- Date currentStepStopDate = DateUtils.addMinutes(currentStepStartDate, step.getRecordingTime());
+ Date currentStepStopDate = DateUtils.addSeconds(currentStepStartDate, step.getRecordingTime());
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(url);
@@ -590,7 +598,7 @@
ArdVideoInspectTaskStep currentStep = objectOptional.get();
/*鑾峰彇鍒板綋鍓嶆楠ょ殑寮�濮嬪拰缁撴潫鏃堕棿*/
Date currentStepStartDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStartTime);
- Date currentStepStopDate = DateUtils.addMinutes(currentStepStartDate, currentStep.getRecordingTime());
+ Date currentStepStopDate = DateUtils.addSeconds(currentStepStartDate, currentStep.getRecordingTime());
/*鍒ゆ柇褰撳墠姝ラ鏃堕棿鏄惁杩囨湡*/
if (!DateUtils.TimeCompare(currentStepStartDate, currentStepStopDate)) {
return true;
--
Gitblit v1.9.3