Merge branch 'master' of http://git.shunzhi.net/taohd/mycloud

邱一成
2 parents 8abdb5cd 758cb489
Showing 1 changed file with 6 additions and 7 deletions Show diff stats
cloud/dahua/src/main/java/com/example/dahua/MyTask.java
@@ -275,18 +275,11 @@ public class MyTask implements ApplicationRunner {
  
             pBuffer.read(0, bufferBytes, 0, dwBufSize);
  
-
             File path = new File(".\\FaceRecoder");
             if (!path.exists()) {
                 path.mkdir();
             }
  
-            //设备ID获取
-            NetSDKLib.NET_DEVICEINFO_Ex deviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
-            ToolKits.GetPointerData(dwUser, deviceInfo);
-
-            String szSn = new String(deviceInfo.sSerialNumber).trim();
-
             ///< 门禁事件
             if (dwAlarmType == NetSDKLib.EVENT_IVS_ACCESS_CTL) {
                 NetSDKLib.DEV_EVENT_ACCESS_CTL_INFO msg = new NetSDKLib.DEV_EVENT_ACCESS_CTL_INFO();
@@ -297,6 +290,12 @@ public class MyTask implements ApplicationRunner {
                 int messageCode = msg.nErrorCode;
                 System.out.println("sda:" + card + " 抓拍照片存储地址:");
  
+                //设备ID获取
+                NetSDKLib.NET_DEVICEINFO_Ex deviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
+                ToolKits.GetPointerData(dwUser, deviceInfo);
+
+                String szSn = new String(deviceInfo.sSerialNumber).trim();
+
                 try {
                     if (!StringUtils.isEmpty(card)) {
                         // 保存图片，获取图片缓存
...	...	@@ -275,18 +275,11 @@ public class MyTask implements ApplicationRunner {
275	275
276	276	pBuffer.read(0, bufferBytes, 0, dwBufSize);
277	277
278		-
279	278	File path = new File(".\\FaceRecoder");
280	279	if (!path.exists()) {
281	280	path.mkdir();
282	281	}
283	282
284		- //设备ID获取
285		- NetSDKLib.NET_DEVICEINFO_Ex deviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
286		- ToolKits.GetPointerData(dwUser, deviceInfo);
287		-
288		- String szSn = new String(deviceInfo.sSerialNumber).trim();
289		-
290	283	///< 门禁事件
291	284	if (dwAlarmType == NetSDKLib.EVENT_IVS_ACCESS_CTL) {
292	285	NetSDKLib.DEV_EVENT_ACCESS_CTL_INFO msg = new NetSDKLib.DEV_EVENT_ACCESS_CTL_INFO();
...	...	@@ -297,6 +290,12 @@ public class MyTask implements ApplicationRunner {
297	290	int messageCode = msg.nErrorCode;
298	291	System.out.println("sda:" + card + " 抓拍照片存储地址:");
299	292
	293	+ //设备ID获取
	294	+ NetSDKLib.NET_DEVICEINFO_Ex deviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
	295	+ ToolKits.GetPointerData(dwUser, deviceInfo);
	296	+
	297	+ String szSn = new String(deviceInfo.sSerialNumber).trim();
	298	+
300	299	try {
301	300	if (!StringUtils.isEmpty(card)) {
302	301	// 保存图片，获取图片缓存
...	...