From 4f6ba520930773a17c5e61523ae37a7f1003d93e Mon Sep 17 00:00:00 2001 From: yiming Date: Wed, 14 Dec 2022 14:29:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=BD=95=E5=83=8F=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java | 3 +-- web/src/main/java/com/zhehekeji/web/service/PlcService.java | 2 +- web/src/main/resources/application-dev.yml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java b/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java index be362c7..433bbe9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java +++ b/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java @@ -257,8 +257,7 @@ public class HikCameraControlModuleImpl implements CameraControlModule { } public void downloadMp4(Integer cameraId, String path, LocalDateTime start, LocalDateTime end) { - start = start.minusMinutes(1); - end = end.minusMinutes(1); + PathUtil.checkDirc(path); HCNetSDK.NET_DVR_TIME startTime = new HCNetSDK.NET_DVR_TIME(); startTime.setTime(start.getYear(), start.getMonthValue(), start.getDayOfMonth(), start.getHour(), start.getMinute(), start.getSecond()); diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java index 0b82413..ba75d92 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -156,7 +156,7 @@ public class PlcService { update.setLeftRight2(plcCmdInfo.getLeftRight2()); update.setColumn2(plcCmdInfo.getColumn2()); update.setRow2(plcCmdInfo.getRow2()); - LocalDateTime endDownLoadTime = endTime.plusSeconds(5); + LocalDateTime endDownLoadTime = endTime.plusSeconds(10); Duration duration = Duration.between(order.getStartTime(),endDownLoadTime); if(duration.toMinutes() > 50){ diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml index bfa02a1..a61a16e 100644 --- a/web/src/main/resources/application-dev.yml +++ b/web/src/main/resources/application-dev.yml @@ -61,7 +61,7 @@ savePath: # ------------服务端类型 0：TCP(罗伯泰克) 1:KSEC(JSON)（昆船） serverMode: 1 ksec: - ip: 172.18.96.1 + ip: 127.0.0.1 port: 3000 # ------------ 实时视频流 全部页面的格式 行列数量 videoStyleConfig: