增加 street与shelves的关联关系表

libs/linux64/avglobal.h

@@ -1,28 +0,0 @@
-
-#ifndef AVGLOBAL_H
-#define AVGLOBAL_H
-
-typedef int					AV_int32;	
-typedef unsigned int		AV_uint32;	
-
-#ifndef __OBJC__
-typedef int					AV_BOOL;
-#else
-typedef BOOL				AV_BOOL;
-#endif	
-
-typedef void*				AV_HANDLE;		
-typedef unsigned char		AV_BYTE;	
-typedef float				AV_float;
-
-#ifdef WIN32
-typedef __int64				AV_int64;	
-typedef unsigned __int64	AV_uint64;	
-#else
-typedef long long			AV_int64;
-typedef unsigned long long	AV_uint64;
-#endif	
-	
-#endif
-
-

web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java

@@ -267,6 +267,14 @@ public class CameraControlController {
         return Result.success();
     }
 
+    @PostMapping("/mp4/{id}")
+    @ApiOperation(value = "录像")
+    public Result MP4(@PathVariable Integer id) {
+        checkLogin(id);
+        PtzControlModule.downloadMp4(id,0);
+        return Result.success();
+    }
+
     private void checkLogin(Integer cameraId){
         if(CameraConnMap.getConnId(cameraId) == null){
             login(cameraId);

web/src/main/java/com/zhehekeji/web/lib/PtzControlModule.java

@@ -9,6 +9,7 @@ import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.time.LocalDateTime;
 
 /**
  * 云台控制接口实现
@@ -227,6 +228,23 @@ public class PtzControlModule {
 
 	}
 
+	public static void downloadMp4(Integer cameraId,int channelId){
+		NetSDKLib.NET_TIME startTime = new NetSDKLib.NET_TIME();
+		LocalDateTime now = LocalDateTime.now();
+		LocalDateTime start = now.minusMinutes(1);
+		startTime.setTime(start.getYear(),start.getMonthValue(),start.getDayOfMonth(),start.getHour(),start.getMinute(),start.getSecond());
+		NetSDKLib.NET_TIME endTime = new NetSDKLib.NET_TIME();
+		LocalDateTime end = now.plusMinutes(1);
+		endTime.setTime(end.getYear(),end.getMonthValue(),end.getDayOfMonth(),end.getHour(),end.getMinute(),end.getSecond());
+
+		//NetSDKLib.LLong l = LoginModule.netsdk.CLIENT_DownloadByTimeEx2(CameraConnMap.getConnId(cameraId),channelId,0,startTime,endTime,"d://www/qq.mp4",null,null,null,null,3,null);
+		NetSDKLib.LLong m_hDownLoadHandle = LoginModule.netsdk.CLIENT_DownloadByTimeEx(CameraConnMap.getConnId(cameraId), channelId, 0,
+				startTime, endTime, "d://www/qq.mp4",
+				null, null, null, null, null);
+
+		System.out.println(m_hDownLoadHandle.longValue());
+    }
+
 
 
 

web/src/main/java/com/zhehekeji/web/mapper/StreetShelveMapper.java

@@ -3,11 +3,12 @@ package com.zhehekeji.web.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhehekeji.web.entity.Stock;
 import com.zhehekeji.web.entity.StreetShelve;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface StreetShelveMapper extends BaseMapper<StreetShelve> {
 
-    void batchInsert(List<StreetShelve> streetShelves);
+    void batchInsert(@Param("streetShelves") List<StreetShelve> streetShelves);
 
 }

web/src/main/resources/linux-x86-64/avglobal.h

@@ -1,28 +0,0 @@
-
-#ifndef AVGLOBAL_H
-#define AVGLOBAL_H
-
-typedef int					AV_int32;	
-typedef unsigned int		AV_uint32;	
-
-#ifndef __OBJC__
-typedef int					AV_BOOL;
-#else
-typedef BOOL				AV_BOOL;
-#endif	
-
-typedef void*				AV_HANDLE;		
-typedef unsigned char		AV_BYTE;	
-typedef float				AV_float;
-
-#ifdef WIN32
-typedef __int64				AV_int64;	
-typedef unsigned __int64	AV_uint64;	
-#else
-typedef long long			AV_int64;
-typedef unsigned long long	AV_uint64;
-#endif	
-	
-#endif
-
-