change

src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java

@@ -74,11 +74,11 @@ public class APIUtil {
     }
 
     public static Headers buildHeaders(Map<String, String> headers) {
-        if (null == headers) return null;
-
         Headers.Builder builder = new Headers.Builder();
-        for (Map.Entry<String, String> entry: headers.entrySet()) {
-            builder.add(entry.getKey(), entry.getValue());
+        if (null != headers) {
+            for (Map.Entry<String, String> entry: headers.entrySet()) {
+                builder.add(entry.getKey(), entry.getValue());
+            }
         }
         return builder.build();
     }
@@ -119,7 +119,9 @@ public class APIUtil {
                 } else if (fieldValue instanceof FileInputStream) {
                     buildFileInputStream(builder, (FileInputStream) fieldValue, fieldName);
                 } else if (fieldValue instanceof ByteBuffer) {
-                    buildFileBytes(builder, ((ByteBuffer) fieldValue).array(), fieldName);
+                    byte[] array = new byte[((ByteBuffer) fieldValue).remaining()];
+                    ((ByteBuffer) fieldValue).get(array);
+                    buildFileBytes(builder, array, fieldName);
                 } else if (fieldValue instanceof Array) {
                     for (int i = 0; i < Array.getLength(fieldValue); i ++) {
                         Object item = Array.get(fieldValue, i);
@@ -161,7 +163,7 @@ public class APIUtil {
 
             MediaType tp = MediaType.get("application/octet-stream");
             RequestBody body = RequestBody.create(tp, content);
-            builder.addFormDataPart(field, "未知文件", body);
+            builder.addFormDataPart(field, "未知文件.jpg", body);
         } catch (IOException e) {
             e.printStackTrace();
             log.error("转换 form-data 数据 到 body 失败: " + e.getMessage());
@@ -171,7 +173,7 @@ public class APIUtil {
     private static void buildFileBytes(MultipartBody.Builder builder, byte[] content, String field) {
         MediaType tp = MediaType.get("application/octet-stream");
         RequestBody body = RequestBody.create(tp, content);
-        builder.addFormDataPart(field, "未知文件", body);
+        builder.addFormDataPart(field, "未知文件.jpg", body);
     }
 
     private static String getSearchString(Map<String, String> query) {

src/main/java/com/huiju/welcome/hardware/service/HikService.java

@@ -54,7 +54,7 @@ public class HikService {
     HCNetSDK.FMSGCallBack_V31 fmsgCallBack;
 
     public boolean init() {
-        String deviceIP = Configer.pick("device.id");
+        String deviceIP = Configer.pick("device.ip");
 
         if (!Ping.attemp(deviceIP)) {
             log.error("设备未上线...");
@@ -65,6 +65,7 @@ public class HikService {
         if (!setDeviceCallback()) return false;
         if (!loginDevice()) return false;
         if (!setDeviceAlarm()) return false;
+        if (!setDeviceOnline()) return false;
 
         return true;
     }
@@ -108,7 +109,7 @@ public class HikService {
         HCNetSDK.NET_DVR_DEVICEINFO_V30 device = new HCNetSDK.NET_DVR_DEVICEINFO_V30();
 
         user = hcNetSDK.NET_DVR_Login_V30(
-                Configer.pick("device.id"),
+                Configer.pick("device.ip"),
                 (short) Integer.valueOf(Configer.pick("device.port")).intValue(),
                 Configer.pick("device.loginUser"),
                 Configer.pick("device.password"),
@@ -341,6 +342,7 @@ public class HikService {
         query.put("port", Configer.pick("device.port"));
         query.put("username", Configer.pick("device.loginUser"));
         query.put("password", Configer.pick("device.password"));
+        query.put("status", "1");
         query.put("api", Configer.pick("api.current") + ":" + Configer.pick("server.port"));
 
         try {

src/main/java/com/huiju/welcome/hardware/service/Monitor.java

@@ -32,7 +32,7 @@ public class Monitor extends Thread {
 
             if (!lastResult && netOk) {
                 while (true) {
-                    boolean success = hikService.initDevice();
+                    boolean success = hikService.init();
                     if (success) break;
 
                     try {

src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java

@@ -48,6 +48,7 @@ public class PersonDetect implements HCNetSDK.FMSGCallBack_V31 {
     }
 
     // 海康回调
+    @Override
     public boolean invoke(NativeLong lCommand, HCNetSDK.NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser) {
         // 回调类型
         switch (lCommand.intValue()){

src/main/resources/application.properties

@@ -7,7 +7,7 @@ device.id=98
 device.name=测试摄像头
 device.loginUser=admin
 device.password=huiju999
-device.ip=192.168.0.98
+device.ip=192.168.0.99
 device.port=8000
 # 1-人脸识别相机,  2-车辆识别相机
 device.type=1