海康 中威合并

libs/hik/DeviceCfg.json

@@ -0,0 +1,39 @@
+{
+	"Devices":	[{
+			"ID":	0,
+			"SerialNumber":	"iDS-2PT7D20IXR-DE/S120210606AACHG12502492X",
+			"ChannelNumber":	1,
+			"StartChannel":	1,
+			"AlarmInNum":	2,
+			"AlarmOutNum":	2,
+			"IPChanNum":	0,
+			"MirrorChanNum":	0,
+			"StartMirrorChanNo":	0,
+			"LocalNodeName":	"192.168.8.64",
+			"DeviceType":	41,
+			"DiskNum":	0,
+			"LoginUserName":	"admin",
+			"LoginUserPwd":	"a1234567",
+			"DeviceIP":	"192.168.8.64",
+			"DeviceMultiIP":	"0.0.0.0",
+			"DevicePort":	8000,
+			"DeviceName":	"",
+			"LoginMode":	0,
+			"Https":	0,
+			"Channels":	[{
+					"ChanID":	0,
+					"DeviceIndex":	0,
+					"ChanIndex":	0,
+					"ChanName":	"Camera1",
+					"Protocol":	0,
+					"PicResolution":	0,
+					"PicQuality":	0,
+					"Enable":	1,
+					"PreviewMode":	0,
+					"PreviewProtocolType":	0,
+					"VideoCodingType":	0,
+					"StreamType":	0,
+					"LinkMode":	0
+				}]
+		}]
+}

libs/hik/IvsDrawer.h

@@ -0,0 +1,706 @@
+#ifndef IVS_DRAWER_H
+#define IVS_DRAWER_H
+
+#include <time.h>
+
+#ifdef _WIN32
+#define IVSDRAWER_API
+#define CALLMETHOD __stdcall
+#else
+#define IVSDRAWER_API
+#define CALLMETHOD
+#endif
+
+#ifdef _WIN32 
+#include <windows.h>
+#define IVS_BOOL        BOOL
+#define IVS_WND_REF 	HWND
+#define IVS_DC_REF		HDC
+#define IVS_COLOR		COLORREF
+#define IVS_RECT		RECT
+typedef POINT			IVSPOINT;
+#else
+#define IVS_BOOL        int
+#define IVS_WND_REF     void*
+#define IVS_DC_REF      void*
+
+typedef struct __IVS_MAC_WND
+{
+    int nWidth;
+    int nHeight;
+}IVS_WND;
+
+typedef struct __IVS_COLOR
+{
+    float cgred;
+    float cggreen;
+    float cgblue;
+}IVS_COLOR;
+
+typedef struct __IVSPOINT
+{
+    float x;
+    float y;
+}IVSPOINT;
+
+typedef struct __IVS_RECT
+{
+    float left;
+    float bottom;
+    float right;
+    float top;
+}IVS_RECT;
+#endif
+
+#ifdef _WIN32
+  #define INT64           __int64
+#else
+	#define DWORD       unsigned int
+	#define INT64       long long
+#endif
+
+typedef enum
+{
+	SHOW_NONE = 0,
+	SHOW_RULE = (1 << 0),
+	SHOW_ALARM = (1 << 1),
+	SHOW_TRACK = (1 << 2),
+	SHOW_ALL = (SHOW_RULE | SHOW_ALARM | SHOW_TRACK),
+}SHOW_TYPE;
+
+typedef enum
+{
+	DRAW_JSON = 0,
+	DRAW_TRACK,
+	DRAW_ALARM,
+	DRAW_RULE,
+	DRAW_ALARMRULE,
+	DRAW_ALARMEX,
+	DRAW_TRACKEX,
+	DRAW_MOVE_CHECK,
+	DRAW_TEST = 9,
+	DRAW_WEB_RULE = 11,
+	DRAW_WEB_ALARM,
+	DRAW_FLOW_INFO,
+	DRAW_TRACKEX2,
+	DRAW_WUXI235_TRACKEX2,
+	DRAW_TRACKEXA1,
+	DRAW_TRACKEX2_TYPE_HUMAN,
+	DRAW_TRACKEX2_TYPE_VEHICLE,
+	DRAW_TRACKEX2_TYPE_NONMOTOR,
+	DRAW_TRACKEX2_TYPE_SHOPPRESENCE, 
+	DRAW_TRACKEX2_TYPE_FLOWBUSINESS,
+	DRAW_INTELFLOW,
+	DRAW_SMARTMOTION,
+	DRAW_END,
+}DRAW_TYPE;
+
+typedef enum
+{
+	IVS_LINGER = 0,				 
+	IVS_TRACKTAIL,				// 轨迹尾巴
+	IVS_GET_OBJECT,
+	IVS_DISABLE_VIDEO_TIME,		// 禁止视频浓缩的时间，默认开启
+	IVS_DISABLE_VIDEO_OBJECT,
+	IVS_TRACK_OBJECT = 6,
+	IVS_SET_PEN_HEIGHT,
+	IVS_TRACK_OBJECT_EX = 8,
+}IVS_CMD_TYPE;
+
+typedef enum
+{
+    DRAW_PEN_DEFAULT = -1,
+    DRAW_PEN_SOLID = 0,
+    DRAW_PEN_DASH,                        
+    DRAW_PEN_DOT,             
+    DRAW_PEN_DASHDOT,         
+    DRAW_PEN_DASHDOTDOT,       
+    DRAW_PEN_NULL,             
+    DRAW_PEN_INSIDEFRAME,     
+    DRAW_PEN_USERSTYLE,        
+    DRAW_PEN_ALTERNATE,        
+}DRAW_PEN_STYLE;
+
+#define IVS_MAX_ACTION_NUM		4
+#define IVS_MAX_EVENT_NUM       64
+#define IVS_MAX_POLYLINE_NUM	32
+#define IVS_MAX_OBJECT_NUM		64
+#define IVS_NAME_NUM		    128
+
+// 二维空间点
+typedef struct 
+{
+	short            nx;
+	short            ny;
+} DH_IVS_SPOINT, *LPDH_IVS_SPOINT;
+
+// 物体对应图片文件信息
+typedef struct  
+{
+	DWORD           dwOffSet;                       // 文件在二进制数据块中的偏移位置, 单位:字节
+	DWORD           dwFileLenth;                    // 文件大小, 单位:字节
+	WORD            wWidth;                         // 图片宽度, 单位:像素
+	WORD            wHeight;                        // 图片高度, 单位:像素
+	char*           pszFilePath;                    // 鉴于历史原因,该成员只在事件上报时有效
+	// 文件路径
+	// 用户使用该字段时需要自行申请空间进行拷贝保存
+	BYTE            bIsDetected;                    // 图片是否算法检测出来的检测过的提交识别服务器时,
+	// 则不需要再时检测定位抠图,1:检测过的,0:没有检测过
+	BYTE			bReserved[3];					// 预留字节数
+	int				nFilePathLen;					// 文件路径长度 既pszFilePath 用户申请的大小
+	DH_IVS_SPOINT	stuPoint;						// 小图左上角在大图的位置，使用绝对坐标系				
+}DH_IVS_PIC_INFO;
+
+typedef struct tagDH_IVS_TIME_EX
+{
+	DWORD                dwYear;                  // 年
+	DWORD                dwMonth;                 // 月
+	DWORD                dwDay;                   // 日
+	DWORD                dwHour;                  // 时
+	DWORD                dwMinute;                // 分
+	DWORD                dwSecond;                // 秒
+	DWORD                dwMillisecond;           // 毫秒
+	DWORD                dwUTC;                   // utc时间(获取时0表示无效，非0有效   下发无效)
+	DWORD				 dwReserved[1];			  // 预留字段
+} DH_IVS_TIME_EX,*LPDH_IVS_TIME_EX;
+// 区域；各边距按整长8192的比例
+typedef struct 
+{
+	long             left;
+	long             top;
+	long             right;
+	long             bottom;
+} DH_IVS_LRECT, *LPDH_IVS_LRECT;
+
+#pragma pack(push)
+#pragma pack(4)
+// 视频分析物体信息结构体
+typedef struct 
+{
+	int                 nObjectID;                          // 物体ID,每个ID表示一个唯一的物体
+	char                szObjectType[128];                  // 物体类型
+	int                 nConfidence;                        // 置信度(0~255),值越大表示置信度越高
+	int                 nAction;                            // 物体动作:1:Appear 2:Move 3:Stay 4:Remove 5:Disappear 6:Split 7:Merge 8:Rename
+	DH_IVS_LRECT         BoundingBox;                        // 包围盒
+	DH_IVS_SPOINT        Center;                             // 物体型心
+	int                 nPolygonNum;                        // 多边形顶点个数
+	DH_IVS_SPOINT        Contour[16];						// 较精确的轮廓多边形
+	DWORD               rgbaMainColor;                      // 表示车牌、车身等物体主要颜色；按字节表示,分别为红、绿、蓝和透明度,例如:RGB值为(0,255,0),透明度为0时, 其值为0x00ff0000.
+	char                szText[128];                        // 物体上相关的带0结束符文本,比如车牌,集装箱号等等
+	char                szObjectSubType[62];                // 物体子类别,根据不同的物体类型,可以取以下子类型：
+	WORD                wColorLogoIndex;                    // 车标索引
+	WORD                wSubBrand;                          // 车辆子品牌 需要通过映射表得到真正的子品牌 映射表详见开发手册
+	BYTE                byReserved1;                     
+	bool                bPicEnble;                          // 是否有物体对应图片文件信息
+	DH_IVS_PIC_INFO     stPicInfo;                          // 物体对应图片信息
+	bool                bShotFrame;                         // 是否是抓拍张的识别结果
+	bool                bColor;                             // 物体颜色(rgbaMainColor)是否可用
+	BYTE                byReserved2;
+	BYTE                byTimeType;                         // 时间表示类型,详见EM_TIME_TYPE说明
+	DH_IVS_TIME_EX     stuCurrentTime;                     // 针对视频浓缩,当前时间戳（物体抓拍或识别时,会将此识别智能帧附在一个视频帧或jpeg图片中,此帧所在原始视频中的出现时间）
+	DH_IVS_TIME_EX     stuStartTime;                       // 开始时间戳（物体开始出现时）
+	DH_IVS_TIME_EX     stuEndTime;                         // 结束时间戳（物体最后出现时）
+	DH_IVS_LRECT         stuOriginalBoundingBox;             // 包围盒(绝对坐标)
+	DH_IVS_LRECT         stuSignBoundingBox;                 // 车标坐标包围盒
+	DWORD               dwCurrentSequence;                  // 当前帧序号（抓下这个物体时的帧）
+	DWORD               dwBeginSequence;                    // 开始帧序号（物体开始出现时的帧序号）
+	DWORD               dwEndSequence;                      // 结束帧序号（物体消逝时的帧序号）
+	INT64               nBeginFileOffset;                   // 开始时文件偏移, 单位: 字节（物体开始出现时,视频帧在原始视频文件中相对于文件起始处的偏移）
+	INT64               nEndFileOffset;                     // 结束时文件偏移, 单位: 字节（物体消逝时,视频帧在原始视频文件中相对于文件起始处的偏移）
+	BYTE                byColorSimilar[8];					// 物体颜色相似度,取值范围：0-100,数组下标值代表某种颜色,详见EM_COLOR_TYPE
+	BYTE                byUpperBodyColorSimilar[8];			// 上半身物体颜色相似度(物体类型为人时有效)
+	BYTE                byLowerBodyColorSimilar[8];			// 下半身物体颜色相似度(物体类型为人时有效)
+	int                 nRelativeID;                        // 相关物体ID
+	char                szSubText[20];                      // "ObjectType"为"Vehicle"或者"Logo"时,表示车标下的某一车系,比如奥迪A6L,由于车系较多,SDK实现时透传此字段,设备如实填写。
+	WORD                wBrandYear;                         // 车辆品牌年款 需要通过映射表得到真正的年款 映射表详见开发手册
+} DH_IVS_OBJECT_INFO;
+#pragma pack(pop)
+
+typedef struct IVS_CONFIG_EVENT
+{
+	char					szEventName[IVS_NAME_NUM];			// 事件名称，详见"事件类型列表"
+	char					szRuleName[IVS_NAME_NUM];			// 规则名称，不同规则不能重名
+	DH_IVS_OBJECT_INFO		stuObject;
+	char					Context[28];
+	int						alarmAction;					    // 与NetSDK定义一致
+	int						alarmType;
+}IVS_CONFIG_EVENT_INFO;
+
+typedef struct IVS_CONFIG_EVENTEX
+{
+	char					szEventName[IVS_NAME_NUM];			// 事件名称，详见"事件类型列表"
+	char					szRuleName[IVS_NAME_NUM];			// 规则名称，不同规则不能重名
+	char					Context[28];					
+	int						alarmAction;					    // 与NetSDK定义一致
+	int						alarmType;
+	int						nObjectNum;
+	DH_IVS_OBJECT_INFO		stuObject[IVS_MAX_OBJECT_NUM];		    // 检测到的物体
+	int						nContext;                           // 该字段未用，作为大类字段
+	void*					pContext;
+}IVS_CONFIG_EVENT_INFOEX;
+
+typedef struct 
+{
+	int						nEventsNum;							// 视频分析规则数
+	IVS_CONFIG_EVENT_INFO	stuEventInfo[IVS_MAX_EVENT_NUM];    // 事件信息
+}IVS_CFG_ANALYSEVENTS_INFO;
+
+typedef struct 
+{
+	int						nEventsNum;							// 视频分析规则数
+	IVS_CONFIG_EVENT_INFOEX stuEventInfo[IVS_MAX_EVENT_NUM];    // 事件信息
+}IVS_CFG_ANALYSEVENTS_INFOEX;
+
+typedef struct
+{
+	int						nX;                                 // 8192坐标系
+	int						nY;		
+}IVS_CFG_POLYLINE;
+
+typedef struct  __IVS_WEB_RULE
+{
+	int						size;
+	int						nRuleType;
+	int						nRuleEnable;
+	int						ndirect1;
+	int						ndirect2;
+	int						nPoint1;
+	int						nPoint2;
+	unsigned char			bActionType[4];
+	DH_IVS_OBJECT_INFO		objectMsg;
+	char					szRuleName[IVS_NAME_NUM];
+	IVS_CFG_POLYLINE		stuDetectLine1[IVS_MAX_POLYLINE_NUM];	//Line
+	IVS_CFG_POLYLINE		stuDetectLine2[IVS_MAX_POLYLINE_NUM];	//Region	
+	int                     nRuleID;
+	IVS_CFG_POLYLINE		stuDirectionLine[2];					//Direction
+	char					szRevered[236];
+}IVS_WEB_RULE;
+
+typedef struct __IVS_WEB_RULE_ARRAY
+{
+	int					    size;
+	int					    nCount;
+	IVS_WEB_RULE*		    pRule;
+}IVS_WEB_RULE_ARRAY;
+
+typedef struct
+{
+	int					objectid;
+	struct tm			startTime;
+	struct tm			endTime;
+	INT64				nBeginFileOffset;				// 开始时文件偏移字节数(物体开始出现时，视频帧在原始视频文件中相对于文件起始处的偏移)
+	INT64				nEndFileOffset;					// 结束时文件偏移字节数(物体消逝时，视频帧在原始视频文件中相对于文件起始处的偏移)
+	int					classid;
+}IVSOBJECT;
+
+typedef struct
+{
+	IVS_BOOL            trackex2objtype;                // 是否显示物体类型，0:否，1:显示，默认不显示
+    IVS_BOOL            trackex2attribute88;            // 是否显示0x88属性包，0:否，1:显示，默认显示
+    IVS_BOOL            trackex2objid;                  // 是否显示物体ID，0:否，1:显示，默认不显示
+    IVS_BOOL            trackex2humanage;	            // 是否显示具体年龄，0:显示年龄段，1:显示年龄，默认显示年龄段
+}TrackEx2Configure;
+
+typedef union
+{
+	IVSOBJECT			object;
+	IVSPOINT			xPt;
+	char				szReverd[128];
+}ObjectContex;
+
+typedef struct _DH_IVS_POINT
+{
+/*************************************************
+** 轨迹点是物体外接矩形的中心
+** 根据X,Y及XSize,YSize计算出的物体外接矩形坐标为
+** (X-XSize, Y-YSize, X+XSize, Y+YSize)
+**************************************************/
+	short 		x; 
+	short 		y; 
+	short		xSize;
+	short		ySize;
+}DH_IVS_POINT; 
+
+typedef struct  _RuleColor
+{
+	int ruletype;
+	IVS_COLOR crColor;		
+}RuleColor;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * 启动IVSDraw(只调用一次)依赖IvsDrawer解析json数据时调用
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_Startup();
+
+/**
+ * 退出IVSDraw
+ */
+IVSDRAWER_API void CALLMETHOD DRAW_Cleanup();
+
+/**
+ * 打开作图端口
+ *
+ * @param[in] nPort 作图端口
+ * @return BOOL，成功返回TRUE，失败返回FALSE
+ */
+IVSDRAWER_API BOOL CALLMETHOD DRAW_Open(int nPort);
+
+/**
+ * 关闭作图端口
+ *
+ * @param[in] nPort 作图端口
+ */
+IVSDRAWER_API void CALLMETHOD DRAW_Close(int nPort);
+
+/**
+ * 重置作图端口
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nType  详见DRAW_TYPE定义，仅DRAW_TRACK,DRAW_ALARM,DRAW_RULE有效
+ * @return BOOL，成功返回TRUE，失败返回FALSE
+ */
+IVSDRAWER_API BOOL CALLMETHOD DRAW_Reset(int nPort, int nType);
+
+/**
+ * 输入jason格式字符串数据，原始数据未经过解析
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] pJsonData 数据内存地址
+ * @param[in] nDataLen 数据长度
+ * @param[in] nPort 作图端口
+ * @param[in] nFrameSeq 帧序号
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_InputJsonData(int nPort, unsigned char* pJsonData, int nDataLen, int nFrameSeq);
+
+/**
+ * 设置规则颜色
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nRuleColor 规则名称和规则颜色
+ * @param[in] nRuleNum 规则数
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_SetRuleColor(int nPort,RuleColor* nRuleColor, int nRuleNum);
+
+/**
+ * 输入规则数据，经过jason解析
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nType 目前没有用到此字段
+ * @param[in] pRuleData 数据内存地址
+ * @param[in] nframe 帧序号
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_InputRuleData(int nPort, int nType, unsigned char* pRuleData, int nframe);
+
+/**
+ * 输入轨迹数据，对应智能分析轨迹帧0xF1(表示辅助帧)0x05(轨迹帧数据)
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nType 目前没有用到此字段
+ * @param[in] pTrackData 数据内存地址
+ * @param[in] nDataLen 数据长度
+ * @param[in] nFrameSeq 帧序号
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_InputTrackData(int nPort, int nType, unsigned char* pTrackData, int nDataLen,int nFrameSeq);
+
+/**
+ * 输入轨迹数据，智能结构化信息帧0xF1(表示辅助帧)0x0E(结构化数据)或者NVR浓缩信息轨迹点
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nType nType=7表示智能结构化帧，nType=19表示智能客流，否则表示NVR浓缩信息轨迹点
+ * @param[in] pTrackData 数据内存地址
+ * @param[in] nDataLen 数据长度
+ * @param[in] nFrameSeq 帧序号
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_InputTrackDataEx2(int nPort, int nType, unsigned char* pTrackData, int nDataLen,int nFrameSeq);
+
+/**
+ * 输入警报数据，经过jason解析
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nType 目前没有用到此字段
+ * @param[in] pAlarmData 数据内存地址
+ * @param[in] nDataLen 数据长度
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_InputAlarmData(int nPort, int nType, unsigned char* pAlarmData, int nDataLen);
+
+/**
+ * 输入警报数据，经过jason解析，与DRAW_InputAlarmData的差异在于数据结构不同
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nType 目前没有用到此字段
+ * @param[in] pAlarmData 数据内存地址
+ * @param[in] nDataLen 数据长度
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_InputAlarmDataEx(int nPort, int nType, unsigned char* pAlarmData, int nDataLen);
+
+/**
+ * 输入动检信息数据
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nType 目前没有用到此字段
+ * @param[in] pData 动检信息数据
+ * @param[in] nDataLen 数据长度
+ * @param[in] nFrameSeq 帧序号
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_InputMoveCheckData(int nPort, int nType, unsigned char* pData, int nDataLen, int nFrameSeq);
+
+/**
+ * 指定位置显示一串字符串（可多行，以\n结尾）
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] pTextData 数据地址
+ * @param[in] nTextNumPos pTextData数据对应的结构体个数
+ * @return int，成功返回0，不成功返回-1
+ */
+typedef struct
+{
+    const char* pText;  // 显示的字符串
+	IVSPOINT hPos;      // 显示位置
+	int nFontsize;      // 字体大小
+	int nRed;           // 字体颜色
+	int nGreen;         // 字体颜色
+	int nBlue;          // 字体颜色
+    int nAlignMode;     // 对齐方式，0：左对齐，1：居中对齐，2：右对齐
+}TextData;
+IVSDRAWER_API int CALLMETHOD DRAW_InputTextData(int nPort, TextData* pTextData, int nTextNumPos);
+
+/**
+ * 执行作图操作
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] hDC 作图设备句柄
+ * @param[in] hWnd 窗口句柄
+ * @param[in] nFrameSeq 帧序号
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_Draw(int nPort, IVS_DC_REF hDC, IVS_WND_REF hWnd, int nFrameSeq);
+
+/**
+ * 设置生存时间
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nType  详见DRAW_TYPE
+ * @param[in] nLifeCount 生存时间
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_SetLifeCount(int nPort, int nType, int nLifeCount);
+
+/**
+ * 设置使能
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] type 类型 参照DRAW_TYPE
+ * @param[in] bEnable 使能标记
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_SetEnable(int nPort, int nType, IVS_BOOL bEnable);
+
+/**
+ * 创建画笔
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nType 规则类型
+ * @param[in] nPenStyle 画笔格式(实线or虚线)，详见DRAW_PEN_STYLE
+ * @param[in] nWidth 画笔宽度
+ * @param[in] crColor 画笔颜色
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_SetPen(int nPort, int nType, int nPenStyle, int nWidth, IVS_COLOR crColor);
+
+/**
+ * 执行命令操作
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nCmdType 详见IVS_CMD_TYPE
+ * @param[in] pContext 仅当nCmdType为IVS_TRACK_OBJECT/IVS_TRACK_OBJECT_EX或IVS_GET_OBJECT，指向ObjectContex结构体
+ *                     其他指向int整型
+ * @param[in] nContextSize pContext对应的结构体大小
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_Ioctl(int nPort, int nCmdType, void* pContext, int nContextSize);
+
+/**
+ * 刷新帧序号
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nFrameSeq 帧序号
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_Refresh(int nPort, int nFrameSeq);
+
+/**
+ * 每调用一次，减少一次规则的生命周期(默认255)，减少到0时删除规则
+ *
+ * @param[in] nPort 作图端口
+ */
+IVSDRAWER_API void CALLMETHOD DRAW_Idle(int nPort);
+
+/**
+ * 清除作图内容
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nReserved 预留参数
+ */
+IVSDRAWER_API void CALLMETHOD DRAW_Clean(int nPort, int nReserved);
+
+/**
+ * 设置轨迹开始时间（视频浓缩）
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nTime 时间
+ * @param[in] nObjectId 物体ID
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_SetTime(int nPort, int nTime, int nObjectId);
+
+/**
+ * 设置显示类型，现有的类型有rule，alarm，track
+ *
+ * @param[in] nPort     作图端口
+ * @param[in] nShowType 详见SHOW_TYPE，可组合使用
+ */
+IVSDRAWER_API void CALLMETHOD DRAW_SetShowType(int nPort, int nShowType);
+
+/**
+ * 画track回调
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] pCallBack 回调函数
+ * @param[in] pUserData 回调参数
+ */
+typedef void (CALLMETHOD* OnDrawOneTrack)(int nClassID, int nObjID, DH_IVS_POINT* pPoints, int nPointNum, void* pUserData);
+IVSDRAWER_API void CALLMETHOD DRAW_SetDrawOneTrackCallback(int nPort, OnDrawOneTrack pCallBack, void* pUserData);
+
+/**
+ * 翻译字符串回调
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] pTranslateCBFunc 回调函数
+ * @param[in] pUserData 回调参数
+ */
+typedef int (CALLMETHOD* fTranslateCallback)(unsigned char* strSrc,int nSrsLen, unsigned char* strDst, int* nDstLen, void* pUserData);
+IVSDRAWER_API void CALLMETHOD DRAW_SetTranslateCallback(int nPort, fTranslateCallback pTranslateCBFunc, void* pUserData);
+
+/**
+ * 由此规则产生的track报警会被忽略
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] pRuleName 规则名
+ * @param[in] bEnable 是否开启
+ */
+IVSDRAWER_API void CALLMETHOD DRAW_SetRuleTrackAlarm(int nPort, const char* pRuleName, bool bEnable);
+
+/**
+ * 设置track的显示规则
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nType: 0：显示所有track（默认方式），1：只显示有报警的track
+ */
+IVSDRAWER_API void CALLMETHOD DRAW_SetShowTrackType(int nPort, int nType);
+
+/**
+ * 设置帧序号
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nFrameSeq 帧序号
+ */
+IVSDRAWER_API void CALLMETHOD DRAW_SetFrameNum(int nPort, int nFrameSeq);
+
+/**
+ * 根据{大类ID, 物体ID}设置跟踪物体颜色, 形状
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nClassId 大类ID
+ * @param[in] nObjectId 物体ID
+ * @param[in] crColor 画笔颜色
+ * @param[in] bSpecialShape 1:特殊形状, 0:默认矩形
+ * @param[in] bSpecialSingle 1:只保留当前跟踪框的特殊形状，其他跟踪框回到默认形状 0：形状不变
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_SetTrackObjectColor(int nPort, int nClassId, int nObjectId, IVS_COLOR crColor, bool bSpecialShape, bool bSpecialSingle);
+
+/**
+ * 根据bSpecialShape标志，设置车辆识别跟踪框形状
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] bSpecialShape 1:特殊形状, 0:默认矩形
+ * @return int，成功返回0，不成功返回-1
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_SetTrackEX2Sharp(int nPort, bool bSpecialShape);
+
+/**
+ * 根据trackex2config的设置来显示某些字段，默认是不显示的
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] trackex2config 控制是否显示某些字段
+ */
+IVSDRAWER_API void CALLMETHOD DRAW_SetTrackEx2Config(int nPort, TrackEx2Configure trackex2config);
+
+/**
+ * 根据bEnable控制规则名称是否显示，默认显示
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] bEnable 控制字段
+ */
+IVSDRAWER_API void CALLMETHOD DRAW_SetRuleNameConfig(int nPort, bool bEnable);
+
+/**
+ * 清除配置数据
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nClearType 清除数据类型 详见IVS_CMD_TYPE
+ */
+IVSDRAWER_API void CALLMETHOD DRAW_ClearIVSConfigData(int nPort, int nClearType);
+
+/**
+ * 设置IVS的显示区域
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] rectRegion 显示区域
+ * @param[in] bEnable 设置使能
+ */
+IVSDRAWER_API void CALLMETHOD DRAW_SetIVSDisplayRegion(int nPort, IVS_RECT *rectRegion, bool bEnable);
+
+/**
+ * NACL与IOS平台特有，设置窗口参数接口
+ *
+ * @param[in] nPort 作图端口
+ * @param[in] nX 窗口左下角X坐标
+ * @param[in] nY 窗口左下角Y坐标
+ * @param[in] nWidth 窗口矩形宽度
+ * @param[in] nHeight 窗口矩形高度
+ */
+IVSDRAWER_API void CALLMETHOD DRAW_SetDrawSurfaceParam(int nPort, int nX, int nY, int nWidth, int nHeight);
+
+/**
+ * MAC平台特有接口
+ * 外部设置显示比例（兼容Retina高清屏幕）
+ * @param[in] nPort 作图端口
+ * @param[in] scale 显示比例
+ */
+IVSDRAWER_API void CALLMETHOD DRAW_SetDisplayScale(int nPort, float scale);
+
+/**
+ * 无效接口
+ */
+IVSDRAWER_API int CALLMETHOD DRAW_GetLastError(int nPort);
+IVSDRAWER_API int CALLMETHOD DRAW_InputJpegData(int nPort, int nType, unsigned char* pJpegData, int nDataLen, int nFrameSeq);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

libs/hik/avglobal.h

@@ -0,0 +1,28 @@
+
+#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
+
+

libs/hik/log4cxx.properties

@@ -0,0 +1,60 @@
+#缺省不输出日志到控制台
+#log4j.rootLogger=DEBUG, stdout, default
+log4j.rootLogger=TRACE, default
+##hlog.async=false
+##hlog.secret.show=true
+##hlog.secret.encrypt=false
+#log4j.logger用于控制日志采集级别及采集内容，Threshold用于控制日志输出级别
+
+#应用于控制台
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender 
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout 
+log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%t] %-5p - %m%n
+
+#设置MVS
+log4j.logger.MVS=TRACE, MVS
+log4j.appender.MVS=org.apache.log4j.RollingFileAppender
+log4j.appender.MVS.File=C:/Users/屈帅龙/MVS/MVS_Log/MVS.log
+log4j.appender.MVS.MaxFileSize=10MB
+log4j.appender.MVS.MaxBackupIndex=12
+log4j.appender.MVS.Append=true
+log4j.appender.MVS.Threshold=TRACE
+log4j.appender.MVS.layout=org.apache.log4j.PatternLayout
+log4j.appender.MVS.layout.ConversionPattern=%d [%t] %-5p %.16c - %m%n
+log4j.additivity.MVS = false
+
+#设置IPCONFIG
+log4j.logger.IPCONFIG=TRACE, IPCONFIG
+log4j.appender.IPCONFIG=org.apache.log4j.RollingFileAppender
+log4j.appender.IPCONFIG.File=C:/Users/屈帅龙/MVS/MVS_Log/IPConfig.log
+log4j.appender.IPCONFIG.MaxFileSize=10MB
+log4j.appender.IPCONFIG.MaxBackupIndex=12
+log4j.appender.IPCONFIG.Append=true
+log4j.appender.IPCONFIG.Threshold=TRACE
+log4j.appender.IPCONFIG.layout=org.apache.log4j.PatternLayout
+log4j.appender.IPCONFIG.layout.ConversionPattern=%d [%t] %-5p %.16c - %m%n
+log4j.additivity.IPCONFIG = false
+
+#设置FIRMWAREUP
+log4j.logger.FIRMWAREUP=TRACE, FIRMWAREUP
+log4j.appender.FIRMWAREUP=org.apache.log4j.RollingFileAppender
+log4j.appender.FIRMWAREUP.File=C:/Users/屈帅龙/MVS/MVS_Log/FirmwareUp.log
+log4j.appender.FIRMWAREUP.MaxFileSize=10MB
+log4j.appender.FIRMWAREUP.MaxBackupIndex=12
+log4j.appender.FIRMWAREUP.Append=true
+log4j.appender.FIRMWAREUP.Threshold=TRACE
+log4j.appender.FIRMWAREUP.layout=org.apache.log4j.PatternLayout
+log4j.appender.FIRMWAREUP.layout.ConversionPattern=%d [%t] %-5p %.16c - %m%n
+log4j.additivity.FIRMWAREUP = false
+
+#设置FeatureBag
+log4j.logger.FEATUREBAG=TRACE, FEATUREBAG
+log4j.appender.FEATUREBAG=org.apache.log4j.RollingFileAppender
+log4j.appender.FEATUREBAG.File=C:/Users/屈帅龙/MVS/MVS_Log/FeatureBag.log
+log4j.appender.FEATUREBAG.MaxFileSize=10MB
+log4j.appender.FEATUREBAG.MaxBackupIndex=12
+log4j.appender.FEATUREBAG.Append=true
+log4j.appender.FEATUREBAG.Threshold=TRACE
+log4j.appender.FEATUREBAG.layout=org.apache.log4j.PatternLayout
+log4j.appender.FEATUREBAG.layout.ConversionPattern=%d [%t] %-5p %.16c - %m%n
+log4j.additivity.FEATUREBAG = false

web/pom.xml

@@ -61,6 +61,13 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/src/main/resources/libs/jna.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>com.sun.jna.examples</groupId>
+            <artifactId>test</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/resources/libs/examples.jar</systemPath>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -8,9 +8,11 @@ import com.zhehekeji.web.mapper.CameraMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 
 @Api(value = "CameraControl",tags = "球机控制管理")
 @RestController
@@ -20,6 +22,8 @@ public class CameraControlController {
 
     @Resource
     private CameraMapper cameraMapper;
+    @Value("${cameraType}")
+    private Integer cameraType;
 
     @PostMapping("/{id}")
     @ApiOperation(value = "球机登录")
@@ -32,8 +36,15 @@ public class CameraControlController {
         log.info("相机登录 cameraId:{}",cameraId);
         Camera camera = cameraMapper.selectById(cameraId);
         Assert.notNull(camera,"球机不存在");
-        NetSDKLib.LLong lLong = LoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword(),cameraId);
-        Assert.isTrue(lLong.longValue() > 0,"登陆失败");
+        NetSDKLib.LLong lLong = null;
+        if(cameraType == 0){
+            lLong = ZWLoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword(),cameraId);
+            Assert.isTrue(lLong.longValue() > 0,"登陆失败");
+        }else if(cameraType == 1){
+            int userId = HikLoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword());
+            Assert.isTrue(userId>=0,"登陆失败");
+            lLong = new NetSDKLib.LLong(userId);
+        }
         CameraConnMap.conn(cameraId,lLong);
         return lLong;
     }
@@ -43,7 +54,11 @@ public class CameraControlController {
     public Result up(@PathVariable Integer id) {
         log.debug("球机控制向上");
         checkLogin(id);
-        PtzControlModule.ptzControlUpStart(id,0,0,1);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlUpStart(id,0,0,1);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlUpStart(id, 1, HCNetSDK.TILT_UP,0);
+        }
         return Result.success();
     }
 
@@ -52,7 +67,12 @@ public class CameraControlController {
     public Result upStop(@PathVariable Integer id) {
         log.debug("球机控制向上 停止");
         checkLogin(id);
-        PtzControlModule.ptzControlUpEnd(id,0);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlUpEnd(id,0);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlUpEnd(id, 1, HCNetSDK.TILT_UP, 1);
+        }
+
         return Result.success();
     }
 
@@ -60,7 +80,11 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制向下")
     public Result down(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlDownStart(id,0,0,1);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlDownStart(id,0,0,1);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlDownStart(id , 1,HCNetSDK.TILT_DOWN,0);
+        }
         log.debug("球机控制向下");
         return Result.success();
     }
@@ -69,7 +93,11 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制向下-停止")
     public Result downStop(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlDownEnd(id,0);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlDownEnd(id,0);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlDownEnd(id, 1, HCNetSDK.TILT_DOWN, 1);
+        }
         log.debug("球机控制向下 停止");
         return Result.success();
     }
@@ -78,7 +106,11 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制向左")
     public Result left(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlLeftStart(id,0,0,1);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlLeftStart(id,0,0,1);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlLeftStart(id, 1,HCNetSDK.PAN_LEFT,0);
+        }
         log.debug("球机控制向左");
         return Result.success();
     }
@@ -87,7 +119,11 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制左-停止")
     public Result leftStop(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlLeftEnd(id,0);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlLeftEnd(id,0);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlLeftEnd(id, 1, HCNetSDK.PAN_LEFT, 1);
+        }
         log.debug("球机控制向左 -停止");
         return Result.success();
     }
@@ -97,7 +133,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制向左上")
     public Result leftUp(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlLeftUpStart(id,0,1,1);
+
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlLeftUpStart(id,0,1,1);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlLeftUpStart(id, 1,HCNetSDK.UP_LEFT,0);
+        }
         log.debug("球机控制向上");
         return Result.success();
     }
@@ -106,7 +147,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制左上-停止")
     public Result leftUpStop(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlLeftUpEnd(id,0);
+
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlLeftUpEnd(id,0);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlLeftUpEnd(id, 1, HCNetSDK.UP_LEFT, 1);
+        }
         log.debug("球机控制向上 停止");
         return Result.success();
     }
@@ -115,7 +161,11 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制向左下")
     public Result leftDown(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlLeftDownStart(id,0,1,1);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlLeftDownStart(id,0,1,1);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlLeftDownStart(id, 1, HCNetSDK.DOWN_LEFT, 0);
+        }
         log.debug("球机控制左下");
         return Result.success();
     }
@@ -124,7 +174,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制左下-停止")
     public Result leftDownStop(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlLeftDownEnd(id,0);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlLeftDownEnd(id,0);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlLeftDownEnd(id, 1, HCNetSDK.DOWN_LEFT, 1);
+        }
+
         log.debug("球机控制左下 停止");
         return Result.success();
     }
@@ -133,7 +188,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制向右")
     public Result right(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlRightStart(id,0,0,1);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlRightStart(id,0,0,1);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlRightStart(id, 1,HCNetSDK.PAN_RIGHT,0);
+        }
+
         log.debug("球机控制右");
         return Result.success();
     }
@@ -142,7 +202,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制右-停止")
     public Result rightStop(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlRightEnd(id,0);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlRightEnd(id,0);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlRightEnd(id, 1, HCNetSDK.PAN_RIGHT, 1);
+        }
+
         log.debug("球机控制右 停止");
         return Result.success();
     }
@@ -152,7 +217,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制向右上")
     public Result rightUp(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlRightUpStart(id,0,1,1);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlRightUpStart(id,0,1,1);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlRightUpStart(id, 1,HCNetSDK.UP_RIGHT,0);
+        }
+
         log.debug("球机控制右上");
         return Result.success();
     }
@@ -161,7 +231,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制右上-停止")
     public Result rightUpStop(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlRightUpEnd(id,0);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlRightUpEnd(id,0);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlRightUpEnd(id, 1, HCNetSDK.UP_RIGHT, 1);
+        }
+
         log.debug("球机控制右上 -停止");
         return Result.success();
     }
@@ -170,7 +245,11 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制向右下")
     public Result rightDown(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlRightDownStart(id,0,1,1);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlRightDownStart(id,0,1,1);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlRightDownStart(id, 1,HCNetSDK.DOWN_RIGHT,0);
+        }
         log.debug("球机控制右下");
         return Result.success();
     }
@@ -179,7 +258,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制右下-停止")
     public Result rightDownStop(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlRightDownEnd(id,0);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlRightDownEnd(id,0);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlRightDownEnd(id, 1, HCNetSDK.DOWN_RIGHT, 1);
+        }
+
         log.debug("球机控制右下 -停止");
         return Result.success();
     }
@@ -188,7 +272,11 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制 变倍+")
     public Result ZoomAddStart(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlZoomAddStart(id,0,1);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlZoomAddStart(id,0,1);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlZoomAddStart(id, 1,HCNetSDK.ZOOM_IN, 0);
+        }
         return Result.success();
     }
 
@@ -196,7 +284,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制 变倍+  停止")
     public Result ZoomAddEnd(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlZoomAddEnd(id,0);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlZoomAddEnd(id,0);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlZoomAddEnd(id, 1, HCNetSDK.ZOOM_IN, 1);
+        }
+
         return Result.success();
     }
 
@@ -204,7 +297,11 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制 变倍-")
     public Result ZoomDecStart(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlZoomDecStart(id,0,1);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlZoomDecStart(id,0,1);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlZoomDecStart(id, 1,HCNetSDK.ZOOM_OUT, 0);
+        }
         return Result.success();
     }
 
@@ -212,7 +309,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制 变倍-  停止")
     public Result ZoomDecEnd(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlZoomDecEnd(id,0);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlZoomDecEnd(id,0);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlZoomDecEnd(id, 1, HCNetSDK.ZOOM_OUT, 0);
+        }
+
         return Result.success();
     }
 
@@ -220,7 +322,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制 变焦 +")
     public Result FocusAddStart(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlFocusAddStart(id,0,1);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlFocusAddStart(id,0,1);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlFocusAddStart(id, 1,HCNetSDK.FOCUS_NEAR, 0);
+        }
+
         return Result.success();
     }
 
@@ -228,7 +335,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制 变焦+  停止")
     public Result focusAddEnd(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlFocusAddEnd(id,0);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlFocusAddEnd(id,0);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlFocusAddEnd(id, 1, HCNetSDK.FOCUS_NEAR, 1);
+        }
+
         return Result.success();
     }
 
@@ -236,7 +348,11 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制 变焦 -")
     public Result FocusDecStart(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlFocusDecStart(id,0,1);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlFocusDecStart(id,0,1);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlFocusDecStart(id, 1,HCNetSDK.FOCUS_FAR, 0);
+        }
         return Result.success();
     }
 
@@ -244,7 +360,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制 变焦-  停止")
     public Result focusDecEnd(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlFocusDecEnd(id,0);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlFocusDecEnd(id,0);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlFocusDecEnd(id, 1, HCNetSDK.FOCUS_FAR, 1);
+        }
+
         return Result.success();
     }
 
@@ -252,7 +373,11 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制 光圈 +")
     public Result irisAddStart(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlIrisAddStart(id,0,1);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlIrisAddStart(id,0,1);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlIrisAddStart(id, 1,HCNetSDK.IRIS_OPEN, 0);
+        }
         return Result.success();
     }
 
@@ -260,7 +385,11 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制 光圈+  停止")
     public Result irisAddEnd(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlIrisAddEnd(id,0);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlIrisAddEnd(id,0);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlIrisAddEnd(id, 1, HCNetSDK.IRIS_OPEN, 1);
+        }
         return Result.success();
     }
 
@@ -268,7 +397,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制 光圈 -")
     public Result irisDecStart(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlIrisDecStart(id,0,1);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlIrisDecStart(id,0,1);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlIrisDecStart(id, 1,HCNetSDK.IRIS_CLOSE, 0);
+        }
+
         return Result.success();
     }
 
@@ -276,7 +410,12 @@ public class CameraControlController {
     @ApiOperation(value = "球机控制 光圈-  停止")
     public Result irisDecEnd(@PathVariable Integer id) {
         checkLogin(id);
-        PtzControlModule.ptzControlIrisDecEnd(id,0);
+        if(cameraType == 0){
+            ZWPtzControlModule.ptzControlIrisDecEnd(id,0);
+        }else if(cameraType == 1){
+            HikPtzControlModule.ptzControlIrisDecEnd(id, 1, HCNetSDK.IRIS_CLOSE, 1);
+        }
+
         return Result.success();
     }
 
@@ -285,17 +424,22 @@ public class CameraControlController {
     public Result pic(@PathVariable Integer id) {
         checkLogin(id);
         OrderInfo orderInfo = new OrderInfo(0L,"SRM123","AAA",1,1,"C5",true);
-        System.out.println(PtzControlModule.pic(id,0,orderInfo));
+        if(cameraType == 0){
+            System.out.println(ZWPtzControlModule.pic(id,0,orderInfo));
+        }else if(cameraType == 1){
+            System.out.println(HikPtzControlModule.pic(id,1,orderInfo,"D:\\work\\qqq.jpeg"));
+        }
+
         return Result.success();
     }
 
-//    @PostMapping("/mp4/{id}")
-//    @ApiOperation(value = "录像")
-//    public Result MP4(@PathVariable Integer id) {
-//        checkLogin(id);
-//        PtzControlModule.downloadMp4(id);
-//        return Result.success();
-//    }
+    @PostMapping("/mp4/{id}")
+    @ApiOperation(value = "录像")
+    public Result MP4(@PathVariable Integer id) {
+        checkLogin(id);
+        HikPtzControlModule.downloadMp4(id,"D:\\work\\qqq_1.mp4","", LocalDateTime.now().minusMinutes(10),LocalDateTime.now().minusMinutes(5));
+        return Result.success();
+    }
 
     private void checkLogin(Integer cameraId){
         if(CameraConnMap.getConnId(cameraId) == null){

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

@@ -6,7 +6,7 @@ import com.zhehekeji.core.pojo.Result;
 import com.zhehekeji.web.entity.Camera;
 import com.zhehekeji.web.entity.CameraIO;
 import com.zhehekeji.web.entity.CameraIOConfig;
-import com.zhehekeji.web.lib.PtzControlModule;
+import com.zhehekeji.web.lib.ZWPtzControlModule;
 import com.zhehekeji.web.pojo.camera.CameraConfigSearchReq;
 import com.zhehekeji.web.pojo.camera.CameraIOPtz;
 import com.zhehekeji.web.pojo.street.StreetSearch;
@@ -108,7 +108,7 @@ public class CameraController {
         //todo
         //validatorUtil.validate(req);
         Integer ptzId = cameraService.getPtzId(req.getCameraIOId());
-        PtzControlModule.toPtz(ptzId,req.getCameraId());
+        ZWPtzControlModule.toPtz(ptzId,req.getCameraId());
         return Result.success();
     }
 }

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

@@ -5,7 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.zhehekeji.common.util.ValidatorUtil;
 import com.zhehekeji.core.pojo.Result;
 import com.zhehekeji.web.entity.Stock;
-import com.zhehekeji.web.lib.PtzControlModule;
+import com.zhehekeji.web.lib.ZWPtzControlModule;
 import com.zhehekeji.web.pojo.category.PageSearch;
 import com.zhehekeji.web.pojo.stock.CheckByMan;
 import com.zhehekeji.web.pojo.stock.StockCheck;
@@ -14,7 +14,6 @@ import com.zhehekeji.web.service.StockService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -115,7 +114,7 @@ public class StockController {
     @ApiOperation(value = "slow")
     @RequestMapping(value = "/slow", method = RequestMethod.GET)
     public Result slow(Integer cameraId,Integer x) {
-        PtzControlModule.toPtzSlow(cameraId,x);
+        ZWPtzControlModule.toPtzSlow(cameraId,x);
         return Result.success();
 
     }
@@ -123,7 +122,7 @@ public class StockController {
     @ApiOperation(value = "currentPosition")
     @RequestMapping(value = "/currentPosition", method = RequestMethod.GET)
     public Result currentPosition(Integer cameraId,Integer ptzId) {
-        PtzControlModule.turn360C8(cameraId,ptzId);
+        ZWPtzControlModule.turn360C8(cameraId,ptzId);
         return Result.success();
     }
 }

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

@@ -0,0 +1,121 @@
+package com.zhehekeji.web.lib;
+
+/**
+ * 海康 登陆接口实现
+ * 主要有 ：初始化、登陆、登出功能
+ */
+public class HikLoginModule {
+
+	public static NetSDKLib netsdk = NetSDKLib.NETSDK_INSTANCE;
+
+	public static HCNetSDK hcNetsdk = HCNetSDK.INSTANCE;
+
+	public static int m_lUserID = -1;//用户句柄
+
+	private static boolean bInit    = false;
+	private static boolean bLogopen = false;
+
+
+	/**
+	 * \if ENGLISH_LANG
+	 * Init
+	 * \else
+	 * 初始化
+	 * \endif
+	 */
+	public static boolean init() {
+		//public static boolean init(NetSDKLib.fDisConnect disConnect, NetSDKLib.fHaveReConnect haveReConnect) {
+
+			bInit = hcNetsdk.NET_DVR_Init();
+		if(!bInit) {
+			System.out.println("Initialize SDK failed");
+			return false;
+		}
+
+		//设置登录超时时间和尝试次数，可选
+		int waitTime = 5000; //登录请求响应超时时间设置为5S
+		int tryTimes = 3;    //登录时尝试建立链接1次
+		//netsdk.CLIENT_SetConnectTime(waitTime, tryTimes);
+
+
+		hcNetsdk.NET_DVR_SetConnectTime(waitTime, tryTimes);
+
+
+		//CaptureReceiveCB captureReceiveCB = SpringContextUtil.getBean(CaptureReceiveCB.class);
+		//netsdk.CLIENT_SetSnapRevCallBack(captureReceiveCB, null);
+
+		return true;
+	}
+
+	/**
+	 * \if ENGLISH_LANG
+	 * CleanUp
+	 * \else
+	 * 清除环境
+	 * \endif
+	 */
+	public static void cleanup() {
+		if(bInit) {
+			hcNetsdk.NET_DVR_Cleanup();
+		}
+	}
+
+	/**
+	 * \if ENGLISH_LANG
+	 * Login Device
+	 * \else
+	 * 登录设备
+	 * \endif
+	 */
+	public static int login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) {
+
+		//注册之前先注销已注册的用户,预览情况下不可注销
+		if (m_lUserID > -1) {
+			//先注销
+			hcNetsdk.NET_DVR_Logout(m_lUserID);
+			m_lUserID = -1;
+		}
+
+		init();
+		HCNetSDK.NET_DVR_USER_LOGIN_INFO m_strLoginInfo = new HCNetSDK.NET_DVR_USER_LOGIN_INFO();//设备登录信息
+		HCNetSDK.NET_DVR_DEVICEINFO_V40 m_strDeviceInfo = new HCNetSDK.NET_DVR_DEVICEINFO_V40();//设备信息
+
+		m_strLoginInfo.sDeviceAddress = new byte[HCNetSDK.NET_DVR_DEV_ADDRESS_MAX_LEN];//设备ip地址
+		System.arraycopy(m_strIp.getBytes(), 0, m_strLoginInfo.sDeviceAddress, 0, m_strIp.length());
+
+		m_strLoginInfo.sUserName = new byte[HCNetSDK.NET_DVR_LOGIN_USERNAME_MAX_LEN];//设备用户名
+		System.arraycopy(m_strUser.getBytes(), 0, m_strLoginInfo.sUserName, 0, m_strUser.length());
+
+		m_strLoginInfo.sPassword = new byte[HCNetSDK.NET_DVR_LOGIN_PASSWD_MAX_LEN];//设备密码
+		System.arraycopy(m_strPassword.getBytes(), 0, m_strLoginInfo.sPassword, 0, m_strPassword.length());
+
+		m_strLoginInfo.wPort = (short) m_nPort;
+
+		m_strLoginInfo.bUseAsynLogin = false; //是否异步登录：0- 否，1- 是
+		m_strLoginInfo.write();
+		m_lUserID = hcNetsdk.NET_DVR_Login_V40(m_strLoginInfo, m_strDeviceInfo);
+		return m_lUserID;
+	}
+
+	/**
+	 * \if ENGLISH_LANG
+	 * Logout Device
+	 * \else
+	 * 登出设备
+	 * \endif
+	 */
+	public static boolean logout() {
+		if(m_lUserID == -1) {
+			return false;
+		}
+
+		boolean bRet = hcNetsdk.NET_DVR_Logout(m_lUserID);
+		if(bRet) {
+			m_lUserID = -1;
+		}
+
+		return bRet;
+	}
+
+
+}

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

@@ -0,0 +1,476 @@
+package com.zhehekeji.web.lib;
+
+import com.sun.jna.ptr.IntByReference;
+import com.zhehekeji.common.util.PathUtil;
+import com.zhehekeji.core.util.Assert;
+import lombok.extern.slf4j.Slf4j;
+
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+
+/**
+ * 云台控制接口实现
+ * 主要有 ：八个方向控制、变倍、变焦、光圈功能
+ */
+@Slf4j
+public class HikPtzControlModule {
+
+    private static CallBack.Mp4ReceiveCB mp4ReceiveCB = new CallBack.Mp4ReceiveCB();
+
+    /**
+     * 向上
+     */
+    public static boolean ptzControlUpStart(Integer cameraId, int nChannelID, int dwPTZCommand,int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0);
+        //return LoginModule.hcNetsdk.NET_DVR_PTZControl(lUserId, dwPTZCommand, 0);
+
+    }
+
+    public static boolean ptzControlUpEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1);
+    }
+
+    /**
+     * 向下
+     */
+    public static boolean ptzControlDownStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0);
+    }
+
+    public static boolean ptzControlDownEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1);
+    }
+
+    /**
+     * 向左
+     */
+    public static boolean ptzControlLeftStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0);
+    }
+
+    public static boolean ptzControlLeftEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1);
+    }
+    /**
+     * 向右
+     */
+    public static boolean ptzControlRightStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0);
+    }
+
+    public static boolean ptzControlRightEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, HCNetSDK.PAN_RIGHT, 1);
+    }
+    /**
+     * 向左上
+     */
+    public static boolean ptzControlLeftUpStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0);
+    }
+
+    public static boolean ptzControlLeftUpEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1);
+    }
+
+    /**
+     * 向右上
+     */
+    public static boolean ptzControlRightUpStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, HCNetSDK.UP_RIGHT, 0);
+    }
+
+    public static boolean ptzControlRightUpEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, HCNetSDK.UP_RIGHT, 1);
+    }
+    /**
+     * 向左下
+     */
+    public static boolean ptzControlLeftDownStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0);
+    }
+    public static  boolean ptzControlLeftDownEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1);
+    }
+    /**
+     * 向右下
+     */
+    public static boolean ptzControlRightDownStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0);
+    }
+
+    public static boolean ptzControlRightDownEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1);
+    }
+
+    /**
+     * 变倍+
+     */
+    public static boolean ptzControlZoomAddStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0);
+    }
+
+    public static boolean ptzControlZoomAddEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1);
+    }
+
+    /**
+     * 变倍-
+     */
+    public static boolean ptzControlZoomDecStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0);
+    }
+
+    public static boolean ptzControlZoomDecEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1);
+    }
+    /**
+     * 变焦+
+     */
+    public static boolean ptzControlFocusAddStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0);
+    }
+
+    public static boolean ptzControlFocusAddEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1);
+    }
+    /**
+     * 变焦-
+     */
+    public static boolean ptzControlFocusDecStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0);
+    }
+
+    public static boolean ptzControlFocusDecEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1);
+    }
+    /**
+     * 光圈+
+     */
+    public static boolean ptzControlIrisAddStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0);
+    }
+
+    public static boolean ptzControlIrisAddEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1);
+    }
+    /**
+     * 光圈-
+     */
+    public static boolean ptzControlIrisDecStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0);
+    }
+
+    public static boolean ptzControlIrisDecEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop)
+    {
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1);
+    }
+
+    public static boolean pic(Integer cameraId, int nChannelID, OrderInfo orderInfo, String path)
+    {
+        Integer cmdSerial = OrderCmdSerial.nextSerial();
+        PathUtil.checkDirc(path);
+        OrderCmdSerial.put(cmdSerial, orderInfo);
+        int lUserId = CameraConnMap.getConnId(cameraId).intValue();
+        short wPicSize = 3;
+        short wPicQuality = 0;
+        HCNetSDK.NET_DVR_JPEGPARA jpegpara = new HCNetSDK.NET_DVR_JPEGPARA(wPicSize, wPicQuality);
+        //jpegpara.write();
+
+        boolean picResult = false;
+        picResult = HikLoginModule.hcNetsdk.NET_DVR_CaptureJPEGPicture(lUserId, nChannelID, jpegpara, path);
+        int error = HikLoginModule.hcNetsdk.NET_DVR_GetLastError();
+        log.error("pic error:{}",error);
+        return picResult;
+    }
+
+    /*public static boolean pic(Integer cameraId, int nChannelID, OrderInfo orderInfo) {
+
+        Integer cmdSerial = OrderCmdSerial.nextSerial();
+        OrderCmdSerial.put(cmdSerial, orderInfo);
+        IntByReference reserved = new IntByReference(0);
+
+        HCNetSDK.NET_DVR_JPEGPARA jpegpara = new HCNetSDK.NET_DVR_JPEGPARA();
+        return true;
+      //  return LoginModule.hcNetsdk.NET_DVR_CaptureJPEGPicture(CameraConnMap.getConnId(cameraId), nChannelID, jpegpara, );
+    }*/
+
+    public static void downloadMp4(Integer cameraId, String path, String orderNum, LocalDateTime start, LocalDateTime end) {
+        //视频结束时间加上5s
+        end = end.minusMinutes(1);
+        start = end.minusSeconds(60);
+        PathUtil.checkDirc(path);
+        //NetSDKLib.NET_TIME startTime = new NetSDKLib.NET_TIME();
+        //startTime.setTime(start.getYear(), start.getMonthValue(), start.getDayOfMonth(), start.getHour(), start.getMinute(), start.getSecond());
+        //NetSDKLib.NET_TIME endTime = new NetSDKLib.NET_TIME();
+        //endTime.setTime(end.getYear(), end.getMonthValue(), end.getDayOfMonth(), end.getHour(), end.getMinute(), end.getSecond());
+        HCNetSDK.NET_DVR_TIME startTime = new HCNetSDK.NET_DVR_TIME();
+        startTime.setTime(start.getYear(), start.getMonthValue(), start.getDayOfMonth(), start.getHour(), start.getMinute(), start.getSecond());
+        HCNetSDK.NET_DVR_TIME endTime = new HCNetSDK.NET_DVR_TIME();
+        endTime.setTime(end.getYear(), end.getMonthValue(), end.getDayOfMonth(), end.getHour(), end.getMinute(), end.getSecond());
+
+        HCNetSDK.NET_DVR_PLAYCOND struDownloadCond = new HCNetSDK.NET_DVR_PLAYCOND();
+        struDownloadCond.dwChannel = 1;
+        struDownloadCond.struStartTime = startTime;
+        struDownloadCond.struStopTime = endTime;
+        struDownloadCond.write();
+
+        log.info("start download mp4 path:{},startTime:{} ,endTime:{},now:{}", path, startTime.toString(), endTime.toString(), LocalDateTime.now());
+        int lUserID = CameraConnMap.getConnId(cameraId).intValue();
+        int result = HikLoginModule.hcNetsdk.NET_DVR_GetFileByTime(lUserID,1,startTime,endTime,path);
+        //int result = HikLoginModule.hcNetsdk.NET_DVR_GetFileByTime_V40(lUserID, path.getBytes(), struDownloadCond);
+        if (result < 0) {
+            //log.error("download error :{}", ToolKits.getErrorCodePrint());
+            log.error("download error:{}",HikLoginModule.hcNetsdk.NET_DVR_GetLastError());
+
+        } else {
+            Integer process = 0;
+
+            IntByReference intByReference = new IntByReference(0);
+            Boolean ok = HikLoginModule.hcNetsdk.NET_DVR_PlayBackControl(result,HikLoginModule.hcNetsdk.NET_DVR_PLAYSTART,process,null);
+            if(!ok){
+                log.error("download error:{}",HikLoginModule.hcNetsdk.NET_DVR_GetLastError());
+            }
+
+
+//            OrderRealtime.startDownload(result, orderNum);
+//            Thread downLoadThread = new Thread(new Runnable() {
+//                @Override
+//                public void run() {
+//                    boolean downStatus = downLoadMp4Func(lUserID, result);
+//                    if(downStatus)
+//                    {
+//                        OrderRealtime.overDownload(result);
+//                    }
+//                }
+//            });
+//            downLoadThread.start();
+        }
+    }
+
+    private static boolean downLoadMp4Func(int lUserID ,int hPlayback)
+    {
+        System.out.println("开始下载");
+        boolean downStatus = true;
+        if(!HikLoginModule.hcNetsdk.NET_DVR_PlayBackControl_V40(hPlayback, HCNetSDK.NET_DVR_PLAYSTART, null, 0, null, new IntByReference(0)))
+        {
+            int iErr = HikLoginModule.hcNetsdk.NET_DVR_GetLastError();
+            downStatus = false;
+            //System.out.println("NET_DVR_PLAYSTART失败，错误号：" + iErr);
+            //LoginModule.hcNetsdk.NET_DVR_Logout(lUserID);
+            //LoginModule.hcNetsdk.NET_DVR_Cleanup();
+            return downStatus;
+        }
+        int iDownPos = 0;
+        while(true)
+        {
+            IntByReference nPos = new IntByReference(0);
+            HikLoginModule.hcNetsdk.NET_DVR_PlayBackControl_V40(hPlayback, HCNetSDK.NET_DVR_PLAYGETPOS, null, 0, nPos.getPointer(), new IntByReference(0));
+
+            iDownPos = nPos.getValue();
+            if(iDownPos < 0)
+            {
+                int iErr = HikLoginModule.hcNetsdk.NET_DVR_GetLastError();
+                //System.out.println("NET_DVR_GetDownloadPos失败，错误号：" + iErr);
+                log.error("NET_DVR_GetDownloadPos失败，错误号：{}", iErr);
+                //LoginModule.hcNetsdk.NET_DVR_Logout(lUserID);
+                //LoginModule.hcNetsdk.NET_DVR_Cleanup();
+                downStatus = false;
+                break;
+            }
+            if((iDownPos >= 0) && (iDownPos <100))
+            {
+                System.out.println("正常下载中，进度：" + iDownPos);
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                continue;
+            }
+            if(iDownPos ==100)
+            {
+                //System.out.println("下载完成");
+                log.info("下载完成");
+                break;
+            }
+
+            if(iDownPos >100)
+            {
+                //System.out.println("下载异常，进度：" + iDownPos);
+                downStatus = false;
+                log.error("下载异常，进度：{}", iDownPos);
+                break;
+            }
+        }
+        return downStatus;
+    }
+    /**
+     * 设置预置点
+     *
+     * @param ptzId    预置点ID
+     * @param name     预置点的名称
+     * @param cameraId 球机ID,来获取登录句柄
+     */
+    /*public static void ptz(Integer ptzId, String name, Integer cameraId) {
+        int dwzCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_SET_CONTROL;
+        Boolean ok = LoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwzCommand, 0, ptzId, 0, 0, ToolKits.GetGBKStringToPointer(name));
+        //Boolean ok = true;
+        Assert.isTrue(ok, "设置失败");
+    }*/
+    public static void ptz(Integer ptzId, String name, Integer cameraId)
+    {
+        int dwzCommand = HCNetSDK.SET_PRESET;
+        Boolean ok = HikLoginModule.hcNetsdk.NET_DVR_PTZPreset_Other(CameraConnMap.getConnId(cameraId).intValue(), 1, dwzCommand, ptzId.intValue());
+        Assert.isTrue(ok, "设置失败");
+    }
+    /**
+     * 转至 预置点
+     *
+     * @param ptzId
+     * @param cameraId
+     */
+    /*public static void toPtz(Integer ptzId, Integer cameraId) {
+        int dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_MOVE_CONTROL;
+        Boolean ok = LoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwPTZCommand, 0, ptzId, 0, 0, null);
+        if (!ok) {
+            log.error("转至预置点 失败 cameraId:{},ptzId:{}", cameraId, ptzId);
+        }
+    }*/
+
+    public static void toPtz(Integer ptzId, Integer cameraId)
+    {
+        int dwPTZCommand = HCNetSDK.GOTO_PRESET;
+        Boolean ok = HikLoginModule.hcNetsdk.NET_DVR_PTZPreset_Other(CameraConnMap.getConnId(cameraId).intValue(), 1, dwPTZCommand, ptzId.intValue());
+        if (!ok) {
+            log.error("转至预置点 失败 cameraId:{},ptzId:{}", cameraId, ptzId);
+        }
+    }
+
+    /**
+     * 转至 预置点
+     *
+     * @param cameraId
+     */
+    public static void toPtzSlow(Integer cameraId,Integer x) {
+        int dwPTZCommand = NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_MOVE_ABSOLUTELY;
+        NetSDKLib.PTZ_CONTROL_ABSOLUTELY absolutely = new NetSDKLib.PTZ_CONTROL_ABSOLUTELY();
+
+        absolutely.stuPosition.nPositionX = x;
+        absolutely.stuPosition.nPositionY = 0;
+        absolutely.stuSpeed.fPositionX = 0.2f;
+        absolutely.stuSpeed.fPositionY = 0.2f;
+        absolutely.write();
+        //absolutely.stuSpeed.fZoom = 0.5f;
+        /*Boolean ok = LoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwPTZCommand,
+                0, 0, 0, 0, absolutely.getPointer());*/
+        Boolean ok = true;
+        if (!ok) {
+            log.error("失败 cameraId:{}", cameraId);
+        }
+    }
+
+    /**
+     * 旋转360度
+     * @param cameraId
+     */
+    public static void turn360C8(Integer cameraId,Integer ptzId){
+       /* Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                int nType = NetSDKLib.NET_DEVSTATE_PTZ_LOCATION;
+                NetSDKLib.NET_PTZ_LOCATION_INFO ptzLocationInfo = new NetSDKLib.NET_PTZ_LOCATION_INFO();
+                IntByReference intRetLen = new IntByReference();
+
+                ptzLocationInfo.write();
+                System.out.println("size:"+ptzLocationInfo.size());
+                boolean bRet = LoginModule.netsdk.CLIENT_QueryDevState(CameraConnMap.getConnId(cameraId), nType, ptzLocationInfo.getPointer(), ptzLocationInfo.size(), intRetLen, 3000);
+                ptzLocationInfo.read();
+
+                if (bRet) {
+                    log.debug("xParam:{}",ptzLocationInfo.nPTZPan);
+                    int qq = (ptzLocationInfo.nPTZPan + 1799) % 3600;
+                    log.debug("xParam turn to:{}",qq);
+                    toPtzSlow(cameraId,qq);
+                    try {
+                        Thread.sleep(5000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                    qq = (qq + 1799) % 3600;
+                    log.debug("xParam turn to:{}",qq);
+                    toPtzSlow(cameraId,qq);
+                    try {
+                        Thread.sleep(5000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                    if(ptzId != null){
+                        log.info(" turn C8");
+                        toPtz(ptzId,cameraId);
+                    }
+                } else {
+                    log.error( " { error code: ( 0x80000000|" + (LoginModule.netsdk.CLIENT_GetLastError() & 0x7fffffff) +" ). 参考  LastError.java }");
+                }
+            }
+        });
+        thread.start();*/
+    }
+
+
+}

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

@@ -1,5 +1,8 @@
 package com.zhehekeji.web.lib;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class StopDownLoadThread extends Thread {
 
     private NetSDKLib.LLong lPlayHandle;
@@ -10,7 +13,7 @@ public class StopDownLoadThread extends Thread {
 
     @Override
     public void run() {
-        System.out.println("下载结束"+lPlayHandle.longValue());
-        LoginModule.netsdk.CLIENT_StopDownload(lPlayHandle);
+        log.info("stop download:{}",lPlayHandle.longValue());
+        ZWLoginModule.netsdk.CLIENT_StopDownload(lPlayHandle);
     }
 }

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

@@ -7,13 +7,11 @@ import com.sun.jna.Pointer;
 import com.sun.jna.Structure;
 import com.sun.jna.ptr.IntByReference;
 
-import javax.imageio.ImageIO;
 import javax.swing.*;
 import javax.swing.filechooser.FileFilter;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
-import java.awt.image.BufferedImage;
 import java.io.*;
 import java.text.SimpleDateFormat;
 
@@ -348,7 +346,7 @@ public class ToolKits {
 	 * 登录设备设备错误状态, 用于界面显示
 	 */
 	public static String getErrorCodeShow() {
-		return ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError());
+		return ErrorCode.getErrorCode(ZWLoginModule.netsdk.CLIENT_GetLastError());
 	}
 
 	/**
@@ -356,8 +354,8 @@ public class ToolKits {
 	 * @return
 	 */
 	public static String getErrorCodePrint() {
-		return "\n{error code: (0x80000000|" + (LoginModule.netsdk.CLIENT_GetLastError() & 0x7fffffff) +").参考  NetSDKLib.java }"
-				+ " - {error info:" + ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()) + "}\n";
+		return "\n{error code: (0x80000000|" + (ZWLoginModule.netsdk.CLIENT_GetLastError() & 0x7fffffff) +").参考  NetSDKLib.java }"
+				+ " - {error info:" + ErrorCode.getErrorCode(ZWLoginModule.netsdk.CLIENT_GetLastError()) + "}\n";
 	}
 
 	/**

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

@@ -10,7 +10,7 @@ import java.io.File;
  * 登陆接口实现
  * 主要有 ：初始化、登陆、登出功能
  */
-public class LoginModule {
+public class ZWLoginModule{
 
 	public static NetSDKLib netsdk 		= NetSDKLib.NETSDK_INSTANCE;
 	public static NetSDKLib configsdk 	= NetSDKLib.CONFIG_INSTANCE;

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

@@ -1,6 +1,5 @@
 package com.zhehekeji.web.lib;
 
-import com.sun.jna.*;
 import com.sun.jna.ptr.IntByReference;
 import com.zhehekeji.common.util.PathUtil;
 import com.zhehekeji.core.util.Assert;
@@ -13,7 +12,8 @@ import java.time.LocalDateTime;
  * 主要有 ：八个方向控制、变倍、变焦、光圈功能
  */
 @Slf4j
-public class PtzControlModule {
+public class ZWPtzControlModule {
+
 
     private static CallBack.Mp4ReceiveCB mp4ReceiveCB = new CallBack.Mp4ReceiveCB();
 
@@ -21,13 +21,14 @@ public class PtzControlModule {
      * 向上
      */
     public static boolean ptzControlUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
-                NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL,
-                lParam1, lParam2, 0, 0);
+            return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+                    NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL,
+                    lParam1, lParam2, 0, 0);
+
     }
 
     public static boolean ptzControlUpEnd(Integer cameraId, int nChannelID) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL,
                 0, 0, 0, 1);
     }
@@ -36,13 +37,13 @@ public class PtzControlModule {
      * 向下
      */
     public static boolean ptzControlDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL,
                 lParam1, lParam2, 0, 0);
     }
 
     public static boolean ptzControlDownEnd(Integer cameraId, int nChannelID) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL,
                 0, 0, 0, 1);
     }
@@ -51,13 +52,13 @@ public class PtzControlModule {
      * 向左
      */
     public static boolean ptzControlLeftStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL,
                 lParam1, lParam2, 0, 0);
     }
 
     public static boolean ptzControlLeftEnd(Integer cameraId, int nChannelID) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL,
                 0, 0, 0, 1);
     }
@@ -66,13 +67,13 @@ public class PtzControlModule {
      * 向右
      */
     public static boolean ptzControlRightStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL,
                 lParam1, lParam2, 0, 0);
     }
 
     public static boolean ptzControlRightEnd(Integer cameraId, int nChannelID) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL,
                 0, 0, 0, 1);
     }
@@ -81,13 +82,13 @@ public class PtzControlModule {
      * 向左上
      */
     public static boolean ptzControlLeftUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP,
                 lParam1, lParam2, 0, 0);
     }
 
     public static boolean ptzControlLeftUpEnd(Integer cameraId, int nChannelID) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP,
                 0, 0, 0, 1);
     }
@@ -96,13 +97,13 @@ public class PtzControlModule {
      * 向右上
      */
     public static boolean ptzControlRightUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP,
                 lParam1, lParam2, 0, 0);
     }
 
     public static boolean ptzControlRightUpEnd(Integer cameraId, int nChannelID) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP,
                 0, 0, 0, 1);
     }
@@ -111,13 +112,13 @@ public class PtzControlModule {
      * 向左下
      */
     public static boolean ptzControlLeftDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN,
                 lParam1, lParam2, 0, 0);
     }
 
     public static boolean ptzControlLeftDownEnd(Integer cameraId, int nChannelID) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN,
                 0, 0, 0, 1);
     }
@@ -126,13 +127,13 @@ public class PtzControlModule {
      * 向右下
      */
     public static boolean ptzControlRightDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN,
                 lParam1, lParam2, 0, 0);
     }
 
     public static boolean ptzControlRightDownEnd(Integer cameraId, int nChannelID) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN,
                 0, 0, 0, 1);
     }
@@ -141,13 +142,13 @@ public class PtzControlModule {
      * 变倍+
      */
     public static boolean ptzControlZoomAddStart(Integer cameraId, int nChannelID, int lParam2) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_ADD_CONTROL,
                 0, lParam2, 0, 0);
     }
 
     public static boolean ptzControlZoomAddEnd(Integer cameraId, int nChannelID) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_ADD_CONTROL,
                 0, 0, 0, 1);
     }
@@ -156,13 +157,13 @@ public class PtzControlModule {
      * 变倍-
      */
     public static boolean ptzControlZoomDecStart(Integer cameraId, int nChannelID, int lParam2) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_DEC_CONTROL,
                 0, lParam2, 0, 0);
     }
 
     public static boolean ptzControlZoomDecEnd(Integer cameraId, int nChannelID) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_DEC_CONTROL,
                 0, 0, 0, 1);
     }
@@ -171,13 +172,13 @@ public class PtzControlModule {
      * 变焦+
      */
     public static boolean ptzControlFocusAddStart(Integer cameraId, int nChannelID, int lParam2) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_ADD_CONTROL,
                 0, lParam2, 0, 0);
     }
 
     public static boolean ptzControlFocusAddEnd(Integer cameraId, int nChannelID) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_ADD_CONTROL,
                 0, 0, 0, 1);
     }
@@ -186,13 +187,13 @@ public class PtzControlModule {
      * 变焦-
      */
     public static boolean ptzControlFocusDecStart(Integer cameraId, int nChannelID, int lParam2) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_DEC_CONTROL,
                 0, lParam2, 0, 0);
     }
 
     public static boolean ptzControlFocusDecEnd(Integer cameraId, int nChannelID) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_DEC_CONTROL,
                 0, 0, 0, 1);
     }
@@ -201,13 +202,13 @@ public class PtzControlModule {
      * 光圈+
      */
     public static boolean ptzControlIrisAddStart(Integer cameraId, int nChannelID, int lParam2) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_ADD_CONTROL,
                 0, lParam2, 0, 0);
     }
 
     public static boolean ptzControlIrisAddEnd(Integer cameraId, int nChannelID) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_ADD_CONTROL,
                 0, 0, 0, 1);
     }
@@ -216,13 +217,13 @@ public class PtzControlModule {
      * 光圈-
      */
     public static boolean ptzControlIrisDecStart(Integer cameraId, int nChannelID, int lParam2) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_DEC_CONTROL,
                 0, lParam2, 0, 0);
     }
 
     public static boolean ptzControlIrisDecEnd(Integer cameraId, int nChannelID) {
-        return LoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
+        return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID,
                 NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_DEC_CONTROL,
                 0, 0, 0, 1);
     }
@@ -236,7 +237,7 @@ public class PtzControlModule {
         stuSnapParams.CmdSerial = OrderCmdSerial.nextSerial();
         OrderCmdSerial.put(stuSnapParams.CmdSerial, orderInfo);
         IntByReference reserved = new IntByReference(0);
-        return LoginModule.netsdk.CLIENT_SnapPictureEx(CameraConnMap.getConnId(cameraId), stuSnapParams, reserved);
+        return ZWLoginModule.netsdk.CLIENT_SnapPictureEx(CameraConnMap.getConnId(cameraId), stuSnapParams, reserved);
 
     }
 
@@ -260,7 +261,7 @@ public class PtzControlModule {
         NetSDKLib.NET_OUT_DOWNLOAD_BY_DATA_TYPE net_out_download_by_data_type = new NetSDKLib.NET_OUT_DOWNLOAD_BY_DATA_TYPE();
         net_out_download_by_data_type.write();
         log.info("start download mp4 path:{},startTime:{} ,endTime:{},now:{}", path, startTime.toString(), endTime.toString(), LocalDateTime.now());
-        NetSDKLib.LLong l = LoginModule.netsdk.CLIENT_DownloadByDataType(CameraConnMap.getConnId(cameraId), download_by_data_type.getPointer(), net_out_download_by_data_type.getPointer(), 8000);
+        NetSDKLib.LLong l = ZWLoginModule.netsdk.CLIENT_DownloadByDataType(CameraConnMap.getConnId(cameraId), download_by_data_type.getPointer(), net_out_download_by_data_type.getPointer(), 8000);
         if (l.longValue() == 0) {
             log.error("download error :{}", ToolKits.getErrorCodePrint());
         } else {
@@ -277,7 +278,7 @@ public class PtzControlModule {
      */
     public static void ptz(Integer ptzId, String name, Integer cameraId) {
         int dwzCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_SET_CONTROL;
-        Boolean ok = LoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwzCommand, 0, ptzId, 0, 0, ToolKits.GetGBKStringToPointer(name));
+        Boolean ok = ZWLoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwzCommand, 0, ptzId, 0, 0, ToolKits.GetGBKStringToPointer(name));
         Assert.isTrue(ok, "设置失败");
     }
 
@@ -289,7 +290,7 @@ public class PtzControlModule {
      */
     public static void toPtz(Integer ptzId, Integer cameraId) {
         int dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_MOVE_CONTROL;
-        Boolean ok = LoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwPTZCommand, 0, ptzId, 0, 0, null);
+        Boolean ok = ZWLoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwPTZCommand, 0, ptzId, 0, 0, null);
         if (!ok) {
             log.error("转至预置点 失败 cameraId:{},ptzId:{},error:{}", cameraId, ptzId,ToolKits.getErrorCodePrint());
         }
@@ -310,7 +311,7 @@ public class PtzControlModule {
         absolutely.stuSpeed.fPositionY = 0.2f;
         absolutely.write();
         //absolutely.stuSpeed.fZoom = 0.5f;
-        Boolean ok = LoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwPTZCommand,
+        Boolean ok = ZWLoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwPTZCommand,
                 0, 0, 0, 0, absolutely.getPointer());
         if (!ok) {
 
@@ -332,7 +333,7 @@ public class PtzControlModule {
 
                 ptzLocationInfo.write();
                 System.out.println("size:"+ptzLocationInfo.size());
-                boolean bRet = LoginModule.netsdk.CLIENT_QueryDevState(CameraConnMap.getConnId(cameraId), nType, ptzLocationInfo.getPointer(), ptzLocationInfo.size(), intRetLen, 3000);
+                boolean bRet = ZWLoginModule.netsdk.CLIENT_QueryDevState(CameraConnMap.getConnId(cameraId), nType, ptzLocationInfo.getPointer(), ptzLocationInfo.size(), intRetLen, 3000);
                 ptzLocationInfo.read();
 
                 if (bRet) {

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

@@ -1,14 +1,13 @@
 package com.zhehekeji.web.service;
 
 import com.alibaba.excel.EasyExcel;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zhehekeji.core.util.Assert;
 import com.zhehekeji.web.entity.Camera;
 import com.zhehekeji.web.entity.CameraIO;
 import com.zhehekeji.web.entity.CameraIOConfig;
-import com.zhehekeji.web.lib.PtzControlModule;
+import com.zhehekeji.web.lib.ZWPtzControlModule;
 import com.zhehekeji.web.mapper.CameraIOConfigMapper;
 import com.zhehekeji.web.mapper.CameraIOMapper;
 import com.zhehekeji.web.mapper.CameraMapper;
@@ -180,7 +179,7 @@ public class CameraService {
             conver(cameraIO,type);
             ioMapper.updateById(cameraIO);
         }
-        PtzControlModule.ptz(ptzId, cameraIO.getName(), cameraId);
+        ZWPtzControlModule.ptz(ptzId, cameraIO.getName(), cameraId);
         log.info("设置 预置点 球机ID:{},预置点ID:{}", cameraId, ptzId);
         return cameraIO.getId();
     }

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

@@ -2,12 +2,11 @@ package com.zhehekeji.web.service;
 
 import com.zhehekeji.web.entity.Camera;
 import com.zhehekeji.web.entity.Street;
-import com.zhehekeji.web.lib.CameraConnMap;
-import com.zhehekeji.web.lib.LoginModule;
-import com.zhehekeji.web.lib.NetSDKLib;
+import com.zhehekeji.web.lib.*;
 import com.zhehekeji.web.mapper.CameraMapper;
 import com.zhehekeji.web.mapper.StreetMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
@@ -30,11 +29,14 @@ public class InitService implements ApplicationRunner {
 
     public static Integer cameraNum;
 
+    @Value("${cameraType}")
+    private Integer cameraType;
+
     @Override
     public void run(ApplicationArguments args) throws Exception {
         //球机登录
         List<Camera> cameras = cameraMapper.selectByMap(new HashMap<>(0));
-        loginThread loginThread = new loginThread(cameras);
+        loginThread loginThread = new loginThread(cameras, cameraType);
         loginThread.start();
         //plc 连接状态初始化
         List<Street> streets = streetMapper.selectByMap(new HashMap<>(0));
@@ -59,20 +61,36 @@ public class InitService implements ApplicationRunner {
 
         List<Camera> cameras;
 
-        public loginThread(List<Camera> cameras){
+        Integer cameraType;
+
+        public loginThread(List<Camera> cameras,Integer cameraType){
             this.cameras = cameras;
+            this.cameraType = cameraType;
         }
+
         @Override
         public void run() {
             cameras.forEach(camera -> {
-                NetSDKLib.LLong lLong = LoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword(),camera.getId());
-                if(lLong.longValue() <= 0){
-                    log.error("初始相机 登录失败：cameraId{}",camera.getId());
-                }else {
-                    CameraConnMap.conn(camera.getId(),lLong);
-                    log.info("初始相机登录成功 cameraId:{},loginId:{}",camera.getId(),lLong.longValue());
+                if(cameraType == 0){
+                    NetSDKLib.LLong lLong = ZWLoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword(),camera.getId());
+                    if(lLong.longValue() <= 0){
+                        log.error("初始相机 登录失败：cameraId{}",camera.getId());
+                    }else {
+                        CameraConnMap.conn(camera.getId(),lLong);
+                        log.info("初始相机登录成功 cameraId:{},loginId:{}",camera.getId(),lLong.longValue());
+                    }
+                }else if(cameraType == 1){
+                    int userId = HikLoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword());
+                    if(userId < 0){
+                        log.error("初始相机 登录失败：cameraId{}",camera.getId());
+                    }else {
+                        NetSDKLib.LLong lLong = new NetSDKLib.LLong(userId);
+                        CameraConnMap.conn(camera.getId(),lLong);
+                        log.info("初始相机登录成功 cameraId:{},loginId:{}",camera.getId(),lLong.longValue());
+                    }
                 }
             });
         }
     }
+
 }

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

@@ -1,6 +1,5 @@
 package com.zhehekeji.web.service;
 
-import com.zhehekeji.web.lib.PtzControlModule;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.FixedLengthFrameDecoder;

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

@@ -5,7 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.zhehekeji.common.util.PathUtil;
 import com.zhehekeji.web.entity.Order;
 import com.zhehekeji.web.entity.Street;
-import com.zhehekeji.web.lib.PtzControlModule;
+import com.zhehekeji.web.lib.ZWPtzControlModule;
 import com.zhehekeji.web.mapper.OrderMapper;
 import com.zhehekeji.web.mapper.StreetMapper;
 import com.zhehekeji.web.pojo.OrderSaveReq;
@@ -104,12 +104,12 @@ public class OrderService {
 
             if (street.getCamera1Id() != null) {
                 String path = PathUtil.createFileName("mp4");
-                PtzControlModule.downloadMp4(street.getCamera1Id(), mp4Path + path, orderNum, order.getStartTime(), update.getEndTime());
+                ZWPtzControlModule.downloadMp4(street.getCamera1Id(), mp4Path + path, orderNum, order.getStartTime(), update.getEndTime());
                 update.setVideoPath1(path);
             }
             if (street.getCamera2Id() != null) {
                 String path = PathUtil.createFileName("mp4");
-                PtzControlModule.downloadMp4(street.getCamera2Id(), mp4Path + path, orderNum, order.getStartTime(), update.getEndTime());
+                ZWPtzControlModule.downloadMp4(street.getCamera2Id(), mp4Path + path, orderNum, order.getStartTime(), update.getEndTime());
                 update.setVideoPath2(path);
             }
             orderMapper.updateById(update);

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

@@ -153,8 +153,8 @@ public class PlcService {
             stockMapper.updateById(stock);
         }
         if(!code.equals(originalPoint)){
-            PtzControlModule.pic(street.getCamera1Id(),0,orderInfo);
-            PtzControlModule.pic(street.getCamera2Id(),0,orderInfo);
+            ZWPtzControlModule.pic(street.getCamera1Id(),0,orderInfo);
+            ZWPtzControlModule.pic(street.getCamera2Id(),0,orderInfo);
         }
     }
 
@@ -179,7 +179,7 @@ public class PlcService {
         ioConfigs.forEach(ioConfig->{
             if(ioConfig.getPtzId() != null && ioConfig.getPtzId() > 0){
                 log.info("tp ptz , code:{},cameraId:{}",code,cameraId1);
-                PtzControlModule.toPtz(ioConfig.getPtzId(),ioConfig.getCameraId());
+                ZWPtzControlModule.toPtz(ioConfig.getPtzId(),ioConfig.getCameraId());
             }
         });
     }
@@ -262,12 +262,12 @@ public class PlcService {
                         warn.setEndTime(LocalDateTime.now());
                         if (street.getCamera1Id() != null) {
                             String path = PathUtil.createFileName("mp4");
-                            PtzControlModule.downloadMp4(street.getCamera1Id(), mp4Path + path, warnId.toString(), warn.getStartTime(), warn.getEndTime());
+                            ZWPtzControlModule.downloadMp4(street.getCamera1Id(), mp4Path + path, warnId.toString(), warn.getStartTime(), warn.getEndTime());
                             warn.setVideoPath1(path);
                         }
                         if (street.getCamera2Id() != null) {
                             String path = PathUtil.createFileName("mp4");
-                            PtzControlModule.downloadMp4(street.getCamera2Id(), mp4Path + path, warnId.toString(), warn.getStartTime(), warn.getEndTime());
+                            ZWPtzControlModule.downloadMp4(street.getCamera2Id(), mp4Path + path, warnId.toString(), warn.getStartTime(), warn.getEndTime());
                             warn.setVideoPath2(path);
                         }
                         warnMapper.updateById(warn);
@@ -319,7 +319,7 @@ public class PlcService {
             if(ioConfigs.size() > 0){
                 ptzId = ioConfigs.get(0).getPtzId();
             }
-            PtzControlModule.turn360C8(street.getCamera1Id(),ptzId);
+            ZWPtzControlModule.turn360C8(street.getCamera1Id(),ptzId);
         }
         if(street.getCamera2Id() != null) {
             List<CameraIO> ioConfigs = ioMapper.selectList(new QueryWrapper<CameraIO>().eq("code","C8").eq("camera_id",street.getCamera2Id()));
@@ -327,7 +327,7 @@ public class PlcService {
             if(ioConfigs.size() > 0){
                 ptzId = ioConfigs.get(0).getPtzId();
             }
-            PtzControlModule.turn360C8(street.getCamera2Id(),ptzId);
+            ZWPtzControlModule.turn360C8(street.getCamera2Id(),ptzId);
         }
     }
 }

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

@@ -44,4 +44,5 @@ cameraPort: 37777
 # -----图片  mp4下载地址
 mediaPath: d:\\data\media\
 mp4Path: d:\\data\mp4\
-# ------------
+# ------------球機選擇--- 0:中威     1：海康
+cameraType: 1