不管权限

增加录像机

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发送给授权人员");
     }
 }

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 {

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<Camera>().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();

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
 # --------本服务端口号