ffmpeg 转海康格式

web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java

@@ -116,7 +116,11 @@ public class HikCameraControlModuleImpl implements CameraControlModule {
     public boolean ptzControlLeftDownStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
     {
         int lUserId = CameraConnMap.getConnId(cameraId).intValue();
-        return HikLoginModuleImpl.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, 1, HCNetSDK.DOWN_LEFT, 0);
+        Boolean ok =  HikLoginModuleImpl.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, 1, HCNetSDK.DOWN_LEFT, 0);
+        if(!ok){
+            log.error("error:{},cameraId:{}", HikLoginModuleImpl.hcNetsdk.NET_DVR_GetLastError(),cameraId);
+        }
+        return ok;
     }
     public boolean ptzControlLeftDownEnd(Integer cameraId, int nChannelID)
     {
@@ -311,7 +315,7 @@ public class HikCameraControlModuleImpl implements CameraControlModule {
 
     public static void convetor(String videoInputPath, String videoOutPath){
         List<String> command = new ArrayList<String>();
-        command.add("E:\\ffmpeg-N-104583-ge5367b481b-win64-gpl\\bin\\ffmpeg.exe");
+        command.add(".\\libs\\ffmpeg\\ffmpeg.exe");
         command.add("-i");
         command.add(videoInputPath);
         command.add("-c");

web/src/main/java/com/zhehekeji/web/lib/hik/HikLoginModuleImpl.java

@@ -4,6 +4,7 @@ import com.zhehekeji.web.lib.CameraControlLoginModule;
 import com.zhehekeji.web.lib.OrderInfo;
 import com.zhehekeji.web.lib.joyware.NetSDKLib;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -12,6 +13,7 @@ import java.util.Map;
  * 海康 登陆接口实现
  * 主要有 ：初始化、登陆、登出功能
  */
+@Slf4j
 public class HikLoginModuleImpl implements CameraControlLoginModule {
 
 	public static NetSDKLib netsdk = NetSDKLib.NETSDK_INSTANCE;
@@ -88,9 +90,11 @@ public class HikLoginModuleImpl implements CameraControlLoginModule {
 		HCNetSDK.NET_DVR_DEVICEINFO_V30 m_strDeviceInfo30 = new HCNetSDK.NET_DVR_DEVICEINFO_V30();//设备信息
 
 		int m_lUserID = hcNetsdk.NET_DVR_Login_V30(m_strIp,(short) m_nPort,m_strUser,m_strPassword,m_strDeviceInfo30);
-		//int m_lUserID = hcNetsdk.NET_DVR_Login_V40(m_strLoginInfo, m_strDeviceInfo);
+		if(m_lUserID < 0){
-		System.out.println(m_strDeviceInfo30.byStartDChan);
+			log.error("hik login error,ip:{},port:{},errorCode:{}",m_strIp,m_nPort,hcNetsdk.NET_DVR_GetLastError());
-		System.out.println(hcNetsdk.NET_DVR_GetLastError());
+		}else {
+			log.info("hik login success");
+		}
 		return new NetSDKLib.LLong(m_lUserID);
 	}
 

web/src/main/java/com/zhehekeji/web/service/RealTimeService.java

@@ -55,13 +55,13 @@ public class RealTimeService {
             realTime.setCameras(cameraList);
             realTimes.add(realTime);
         });
-        RealTime all = new RealTime();
+//        RealTime all = new RealTime();
-        all.setStreetId(0);
+//        all.setStreetId(0);
-        all.setStreetName("全部");
+//        all.setStreetName("全部");
-        all.setCameras(cameras);
+//        all.setCameras(cameras);
-        all.setVideoStyleRow(configProperties.getVideoStyleConfig().getVideoStyleRow());
+//        all.setVideoStyleRow(configProperties.getVideoStyleConfig().getVideoStyleRow());
-        all.setVideoStyleColumn(configProperties.getVideoStyleConfig().getVideoStyleColumn());
+//        all.setVideoStyleColumn(configProperties.getVideoStyleConfig().getVideoStyleColumn());
-        realTimes.add(all);
+//        realTimes.add(all);
         return realTimes;
 
     }

web/src/main/resources/application-dev.yml

@@ -27,7 +27,7 @@ userUrl: http://115.236.65.98:11001
 # ----默认摄像头的连接信息
 cameraConfig:
   # ------------球機選擇--- 0:中威     1：海康
-  cameraType: 0
+  cameraType: 1
   cameraPassword: a1234567
   cameraUser: admin
   cameraPort: 37777