From caec9ebaec44bd50e24f172ef5af93f97164b32f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Tue, 23 Apr 2024 15:47:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E7=AE=A1=E6=9D=83=E9=99=90=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=95=E5=83=8F=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zhehekeji/filter/aspect/LicenseAspect.java | 2 +- .../zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java | 2 +- web/src/main/java/com/zhehekeji/web/service/PlcService.java | 5 ++++- web/src/main/resources/application-prod.yml | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/filter/src/main/java/com/zhehekeji/filter/aspect/LicenseAspect.java b/modules/filter/src/main/java/com/zhehekeji/filter/aspect/LicenseAspect.java index 9d008c7..bb9b29b 100644 --- a/modules/filter/src/main/java/com/zhehekeji/filter/aspect/LicenseAspect.java +++ b/modules/filter/src/main/java/com/zhehekeji/filter/aspect/LicenseAspect.java @@ -19,6 +19,6 @@ public class LicenseAspect { */ @Before("execution(public * com.zhehekeji..*.controller.*.*(..))") public void handler(){ - Assert.isTrue(LPLicense.checkLic(),"未获取授权！！请将C:\\hzleaper_auto_install\\logistics_package\\lp.key发送给授权人员"); + // Assert.isTrue(LPLicense.checkLic(),"未获取授权！！请将C:\\hzleaper_auto_install\\logistics_package\\lp.key发送给授权人员"); } } 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 e4feb92..b93c7fd 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 @@ -301,7 +301,7 @@ public class HikCameraControlModuleImpl implements CameraControlModule { log.info("start download mp4 path:{} ,cameraId:{},start_time：{}，end_time:{}",path,cameraId,startTime.toStringTime(),endTime.toStringTime()); int lUserID = CameraConnMap.getConnId(cameraId).intValue(); - int result = HikLoginModuleImpl.hcNetsdk.NET_DVR_GetFileByTime(lUserID, 1, startTime, endTime, path); + int result = HikLoginModuleImpl.hcNetsdk.NET_DVR_GetFileByTime(lUserID, channelId, startTime, endTime, path); if (result == -1) { log.error("downloadMp4 error code:{},cameraId:{},path:{}", HikLoginModuleImpl.hcNetsdk.NET_DVR_GetLastError(),cameraId,path); } else { 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 88ee4ec..fd7e4a6 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -289,13 +289,16 @@ public class PlcService { Integer channelId = 0; if(camera.getChannel() == null && camera.getChannel().contains("D")){ channelId = Integer.parseInt(camera.getChannel().substring(1)) +32; + + camera = cameraService.getOne(new QueryWrapper().eq("recorder_Ip",camera.getIp()).last("limit 1")); } Integer finalChannelId = channelId; + Camera finalCamera = camera; Thread thread = new Thread(new Runnable() { @Override public void run() { String realPath = configProperties.getSavePath().getMp4Path() + path; - TaskDelayExecutor.addMp4DelayTask(cameraId,realPath,startTime,endTime,configProperties.getCameraConfig().getDelayDownloadMp4(), finalChannelId); + TaskDelayExecutor.addMp4DelayTask(finalCamera.getId(),realPath,startTime,endTime,configProperties.getCameraConfig().getDelayDownloadMp4(), finalChannelId); } }); thread.start(); diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index 7d77be6..1cca60e 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -14,7 +14,7 @@ spring: testWhileIdle: false timeBetweenEvictionRunsMillis: 60000 type: com.alibaba.druid.pool.DruidDataSource - url: jdbc:mysql://127.0.0.1:3306/lia_duoji?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://127.0.0.1:3306/lia_duoji_huawei?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 username: root validationQuery: SELECT 1 FROM DUAL # --------本服务端口号