Browse Source

大华设备对接

yingp 7 years ago
parent
commit
a5b8c2215a

+ 1 - 1
applications/device/device-sdk-dahua/src/main/java/com/usoftchina/smartschool/device/dahua/service/DahuaDataAnalyzeService.java

@@ -65,7 +65,7 @@ public class DahuaDataAnalyzeService {
                     DEV_EVENT_ACCESS_CTL_INFO info = new DEV_EVENT_ACCESS_CTL_INFO(pAlarmInfo);
                     AccessControlInfo accessControlInfo = new AccessControlInfo();
                     if (dwBufSize > 0) {
-                        accessControlInfo.setImageBuffer(pBuffer.getByteArray(0, dwBufSize));
+                        accessControlInfo.setImageData(pBuffer.getByteArray(0, dwBufSize));
                     }
                     accessControlInfo.setCardNo(new String(info.szCardNo));
                     accessControlInfo.setEventType(convertEventType(info.emEventType));

+ 5 - 5
applications/device/device-sdk/src/main/java/com/usoftchina/smartschool/device/dto/AccessControlInfo.java

@@ -27,7 +27,7 @@ public class AccessControlInfo implements Serializable {
     /**
      * 以人脸识别方式打开门禁时,图片信息
      */
-    private byte[] imageBuffer;
+    private byte[] imageData;
     /**
      * 打开门禁的方式
      *
@@ -59,12 +59,12 @@ public class AccessControlInfo implements Serializable {
         this.cardNo = cardNo;
     }
 
-    public byte[] getImageBuffer() {
-        return imageBuffer;
+    public byte[] getImageData() {
+        return imageData;
     }
 
-    public void setImageBuffer(byte[] imageBuffer) {
-        this.imageBuffer = imageBuffer;
+    public void setImageData(byte[] imageData) {
+        this.imageData = imageData;
     }
 
     public int getOpenMethod() {

+ 1 - 1
applications/device/device-server/src/main/java/com/usoftchina/smartschool/device/controller/DeviceController.java

@@ -6,4 +6,4 @@ package com.usoftchina.smartschool.device.controller;
  */
 public class DeviceController {
 
-}
+}