From 6f2b5ebda45464dc5605fc29e792d2acea70da8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Thu, 29 Jun 2023 17:51:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=99wms=E5=86=99?= =?UTF-8?q?=E5=85=A5=E6=97=A5=E5=BF=97=20=E5=A2=9E=E5=8A=A0=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E7=BB=93=E6=9D=9F=E7=9A=84=E6=97=B6=E9=97=B4=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=20=E4=B8=8D=E5=86=8D=E7=94=A8order=5Fnum=E5=88=A4?= =?UTF-8?q?=E5=AE=9A=E5=94=AF=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 ++++ .../com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java | 2 +- web/src/main/java/com/zhehekeji/web/mapper/OrderMapper.java | 2 +- .../java/com/zhehekeji/web/service/ksec/KsecNettyClient.java | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6198d43..a756682 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,7 @@ target /modules/modules.iml /modules/filter/filter.iml /modules/common/common.iml +lp.key +lp.lic +libs/encrypt/Encryptor.dll +modules/common/src/main/resources/lib/core-1.0.0.jar 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 805e56e..e330d10 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 @@ -261,7 +261,7 @@ public class HikCameraControlModuleImpl implements CameraControlModule { public void downloadMp4(Integer cameraId, String path, LocalDateTime start, LocalDateTime end) { ConfigProperties configProperties = SpringContextUtil.getBean(ConfigProperties.class); start = start.minusNanos(1000000000 * configProperties.getKsec().getDownloadStartMp4()); - start = start.minusNanos(1000000000 * configProperties.getKsec().getDownloadEndMp4()); + end = end.plusNanos(1000000000 * configProperties.getKsec().getDownloadEndMp4()); /* start = start.minusMinutes(1); end = end.minusMinutes(1);*/ PathUtil.checkDirc(path); diff --git a/web/src/main/java/com/zhehekeji/web/mapper/OrderMapper.java b/web/src/main/java/com/zhehekeji/web/mapper/OrderMapper.java index 22f6cc8..ed8da3f 100644 --- a/web/src/main/java/com/zhehekeji/web/mapper/OrderMapper.java +++ b/web/src/main/java/com/zhehekeji/web/mapper/OrderMapper.java @@ -11,7 +11,7 @@ import java.util.List; public interface OrderMapper extends BaseMapper { - @Select("select * from `order` where order_num = #{orderNum} limit 1") + @Select("select * from `order` where order_num = #{orderNum} ORDER BY start_time desc limit 1") Order getOneByOrderNum(String orderNum); List list(@Param("req")OrderSearch orderSearch); diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java index 487e4ab..5d07f85 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java +++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java @@ -88,6 +88,7 @@ public class KsecNettyClient { public static void write(KsecInfo ksecInfo){ if(channel != null){ + log.info("write server:"+ksecInfo); channel.writeAndFlush(ksecInfo); }else { log.error(" no connected upPc");