add face delete

.idea/compiler.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="hardware" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel target="8" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="hardware" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel target="8" />
+  </component>
 </project>

.idea/workspace.xml

@@ -1,3 +1,4 @@
+
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="BookmarkManager">

hklib/logs/SdkLog_1_W.log

@@ -0,0 +1,27 @@
+[2019-07-10 11:56:24.099][INF] The COM:Core ver is 5.3.6.30, 2018_08_16. Async:1.
+[2019-07-10 11:56:24.099][DBG] CCoreGlobalCtrl::GetHCNetUtilsAPI, new HCNetUtilsAPI SUCC
+[2019-07-10 11:56:24.099][DBG] CCoreGlobalCtrl::GetHCNetUtilsAPI, Init, SUCC, m_pHCNetUtilsAPI[19011072]
+[2019-07-10 11:56:24.099][DBG] CCoreGlobalCtrl::GetHCNetUtilsAPI, m_pHCNetUtilsAPI[19011072]
+[2019-07-10 11:56:24.099][INF] This hcnetsdk ver is 5.3.6.30 Ver 2018_08_16.
+[2019-07-10 11:56:24.195][INF] login dev 192.168.1.215:8000.
+[2019-07-10 11:56:24.199][INF] Private connect 192.168.1.215:8000 sock=2568 this=0x1284884 cmd=0x10000 port=63084
+[2019-07-10 11:56:24.199][INF] LogonDev1 in[192.168.1.215:8000]
+[2019-07-10 11:56:24.289][INF] Private connect 192.168.1.215:8000 sock=2712 this=0x1284e68 cmd=0x10100 port=63085
+[2019-07-10 11:56:24.294][INF] StopSendThread threadHandle:0
+[2019-07-10 11:56:24.297][INF] Private connect 192.168.1.215:8000 sock=2712 this=0x1284884 cmd=0x10000 port=63086
+[2019-07-10 11:56:24.297][INF] LogonDev1 in[192.168.1.215:8000]
+[2019-07-10 11:56:24.333][DBG] load[E:\CODE\hdware-welcome3\hklib\HCNetSDKCom/HCAlarm.dll] succ
+[2019-07-10 11:56:24.335][INF] AbilityAnalyze---Init-- start
+[2019-07-10 11:56:24.368][INF] The COM:HCAlarm ver is 5.3.6.30, 2018_08_16.
+[2019-07-10 11:56:24.371][INF] Private connect 192.168.1.215:8000 sock=2596 this=0x1284e68 cmd=0x111020 port=63087
+[2019-07-10 11:56:24.374][INF] [SendCommandWithRecv] linkId=1284e68, cmd=0x111020
+[2019-07-10 11:56:24.374][DBG] Alarm[0] IP[192.168.1.215] CArmingSession::Start SUCC
+[2019-07-10 11:56:34.404][DBG] Alarm chan [0] recv timeout[2]!
+[2019-07-10 12:02:00.268][INF] Alarm[0] IP[192.168.1.215] data_len[80] alarm_len[80] status[175]
+[2019-07-10 12:12:01.396][INF] Alarm[0] IP[192.168.1.215] data_len[80] alarm_len[80] status[175]
+[2019-07-10 12:14:20.630][INF] Alarm[0] IP[192.168.1.215] data_len[156] alarm_len[156] status[176]
+[2019-07-10 12:14:21.318][INF] Alarm[0] IP[192.168.1.215] data_len[991715] alarm_len[991715] status[170]
+[2019-07-10 12:14:25.896][INF] Alarm[0] IP[192.168.1.215] data_len[904531] alarm_len[904531] status[170]
+[2019-07-10 12:14:27.312][INF] Alarm[0] IP[192.168.1.215] data_len[156] alarm_len[156] status[176]
+[2019-07-10 12:15:04.979][INF] Alarm[0] IP[192.168.1.215] data_len[956419] alarm_len[956419] status[170]
+[2019-07-10 12:15:06.248][INF] Alarm[0] IP[192.168.1.215] data_len[156] alarm_len[156] status[176]

src/main/java/com/huiju/welcome/hardware/config/InitService.java

@@ -1,47 +1,47 @@
-package com.huiju.welcome.hardware.config;
-
-import com.huiju.welcome.hardware.libs.Configer;
-import com.huiju.welcome.hardware.service.CarDetect;
-import com.huiju.welcome.hardware.service.HikService;
-import com.huiju.welcome.hardware.service.Monitor;
-import com.huiju.welcome.hardware.service.PersonDetect;
-import com.huiju.welcome.hardware.websocket.WSClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-
-import javax.annotation.PostConstruct;
-
-@Configuration
-public class InitService {
-    @Autowired
-    HikService hikService;
-
-    @Autowired
-    Monitor monitor;
-
-    @Autowired
-    WSClient wsClient;
-
-    @Autowired
-    PersonDetect personDetect;
-
-    @Autowired
-    CarDetect carDetect;
-
-    @PostConstruct
-    public void init() {
-        String deviceType = Configer.pick("device.type");
-        String deviceIP = Configer.pick("device.ip");
-
-        // 硬件确定
-        hikService.bindCallback(
-                "2".equals(deviceType) ? carDetect : personDetect
-        );
-
-        // 启动 SDK 支持
-        monitor.listen(deviceIP).start();
-
-        // 启动 websocket 客户端  (注: 非服务端)
-        wsClient.connect();
-    }
-}
+package com.huiju.welcome.hardware.config;
+
+import com.huiju.welcome.hardware.libs.Configer;
+import com.huiju.welcome.hardware.service.CarDetect;
+import com.huiju.welcome.hardware.service.HikService;
+import com.huiju.welcome.hardware.service.Monitor;
+import com.huiju.welcome.hardware.service.PersonDetect;
+import com.huiju.welcome.hardware.websocket.WSClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+
+@Configuration
+public class InitService {
+    @Autowired
+    HikService hikService;
+
+    @Autowired
+    Monitor monitor;
+
+    @Autowired
+    WSClient wsClient;
+
+    @Autowired
+    PersonDetect personDetect;
+
+    @Autowired
+    CarDetect carDetect;
+
+    @PostConstruct
+    public void init() {
+        String deviceType = Configer.pick("device.type");
+        String deviceIP = Configer.pick("device.ip");
+
+        // 硬件确定
+        hikService.bindCallback(
+                "2".equals(deviceType) ? carDetect : personDetect
+        );
+
+        // 启动 SDK 支持
+        monitor.listen(deviceIP).start();
+
+        // 启动 websocket 客户端  (注: 非服务端)
+        wsClient.connect();
+    }
+}

src/main/java/com/huiju/welcome/hardware/controller/CommController.java

@@ -1,116 +1,109 @@
-package com.huiju.welcome.hardware.controller;
-
-import com.huiju.welcome.hardware.libs.APIUtil;
-import com.huiju.welcome.hardware.libs.Configer;
-import com.huiju.welcome.hardware.service.HikService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.DigestUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.net.URI;
-
-
-@RestController
-@RequestMapping("/")
-public class CommController {
-
-    @Autowired
-    HikService hikService;
-
-    @GetMapping("/local")
-    public ResponseBean getLocalFileOfOSS(@RequestParam String url, HttpServletRequest request, HttpServletResponse response) {
-        response.addHeader("Content-type", request.getContentType());
-        if (null == url || "".equals(url.trim())) {
-            return null;
-        }
-
-        URI uri = URI.create(url);
-        String[] parts = uri.getPath().split("\\.");
-
-        // 如果是不支持的格式, 尝试去远程获取并反馈给前端
-        if (null == parts || parts.length < 2) {
-            responseOrigin(url, response);
-            return null;
-        }
-
-        String ext = parts[parts.length - 1];
-        String localFile = md5(url) + "." + ext;
-
-        try {
-            FileInputStream input = new FileInputStream(Configer.pick("assets.dir") + "/" + localFile);
-            responseInputStream(input, response);
-        } catch (FileNotFoundException e) {
-            responseOrigin(url, response, localFile);
-//            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    @PostMapping("/testCompare")
-    public ResponseBean testCompare(MultipartFile file) {
-        try {
-            byte[] bytes = file.getBytes();
-            return ResponseBean.success(hikService.compareImage(bytes));
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return ResponseBean.error("error", 400);
-    }
-
-    private void responseOrigin(String url, HttpServletResponse response, String ...localFiles) {
-        byte[] data = APIUtil.download(url);
-        responseInputBytes(data, response);
-
-        // 保存到本地
-        if (null != localFiles && localFiles.length > 0) {
-            try {
-                FileOutputStream f = null;
-                f = new FileOutputStream(Configer.pick("assets.dir") + "/" + localFiles[0]);
-                f.write(data);
-                f.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private void responseInputStream(InputStream input, HttpServletResponse response) {
-        try {
-            byte[] data = inputStreamToBytes(input);
-            response.getOutputStream().write(data);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void responseInputBytes(byte[] data, HttpServletResponse response) {
-        try {
-            response.getOutputStream().write(data);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private byte[] inputStreamToBytes(InputStream inputStream) throws IOException {
-            int bufferSize = 1024;
-            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-            byte[] data = new byte[bufferSize];
-            int count = -1;
-            while((count = inputStream.read(data,0,bufferSize))!= -1){
-                outputStream.write(data,0,count);
-            }
-
-            return outputStream.toByteArray();
-    }
-
-    private String md5(String src) {
-        return DigestUtils.md5DigestAsHex(src.getBytes());
-    }
-}
+package com.huiju.welcome.hardware.controller;
+
+import com.huiju.welcome.hardware.libs.APIUtil;
+import com.huiju.welcome.hardware.libs.Configer;
+import com.huiju.welcome.hardware.service.HikService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.DigestUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URI;
+
+
+@RestController
+@RequestMapping("/")
+public class CommController {
+
+    @Autowired
+    HikService hikService;
+
+    @GetMapping("/local")
+    public ResponseBean getLocalFileOfOSS(@RequestParam String url,
+                                          @RequestParam String ext,
+                                          HttpServletRequest request,
+                                          HttpServletResponse response) {
+        response.addHeader("Content-type", request.getContentType());
+        if (null == url || "".equals(url.trim())) {
+            return null;
+        }
+
+        String localFile = md5(url) + "." + ext;
+
+        try {
+            FileInputStream input = new FileInputStream(Configer.pick("assets.dir") + "/" + localFile);
+            responseInputStream(input, response);
+        } catch (FileNotFoundException e) {
+            responseOrigin(url, response, localFile);
+//            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    @PostMapping("/testCompare")
+    public ResponseBean testCompare(MultipartFile file) {
+        try {
+            byte[] bytes = file.getBytes();
+            return ResponseBean.success(hikService.compareImage(bytes));
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ResponseBean.error("error", 400);
+    }
+
+    private void responseOrigin(String url, HttpServletResponse response, String ...localFiles) {
+        byte[] data = APIUtil.download(url);
+        responseInputBytes(data, response);
+
+        // 保存到本地
+        if (null != localFiles && localFiles.length > 0) {
+            try {
+                FileOutputStream f = null;
+                f = new FileOutputStream(Configer.pick("assets.dir") + "/" + localFiles[0]);
+                f.write(data);
+                f.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private void responseInputStream(InputStream input, HttpServletResponse response) {
+        try {
+            byte[] data = inputStreamToBytes(input);
+            response.getOutputStream().write(data);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void responseInputBytes(byte[] data, HttpServletResponse response) {
+        try {
+            response.getOutputStream().write(data);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private byte[] inputStreamToBytes(InputStream inputStream) throws IOException {
+            int bufferSize = 1024;
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            byte[] data = new byte[bufferSize];
+            int count = -1;
+            while((count = inputStream.read(data,0,bufferSize))!= -1){
+                outputStream.write(data,0,count);
+            }
+
+            return outputStream.toByteArray();
+    }
+
+    private String md5(String src) {
+        return DigestUtils.md5DigestAsHex(src.getBytes());
+    }
+}

src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java

@@ -4202,7 +4202,7 @@ EMAIL参数结构
     boolean  NET_DVR_SetConfigFile_EX(NativeLong lUserID, String sInBuffer, int dwInSize);
 
     //启用日志文件写入接口
-    boolean  NET_DVR_SetLogToFile(boolean bLogEnable, String strLogDir, boolean bAutoDel);
+    boolean  NET_DVR_SetLogToFile(int nLogLevel, String strLogDir, boolean bAutoDel);
     boolean  NET_DVR_GetSDKState(NET_DVR_SDKSTATE pSDKState);
     boolean  NET_DVR_GetSDKAbility(NET_DVR_SDKABL pSDKAbl);
     boolean  NET_DVR_GetPTZProtocol(NativeLong lUserID, NET_DVR_PTZCFG pPtzcfg);

src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java

@@ -256,7 +256,284 @@ public class HIKSupplement {
         VLR_FARMCAR(227, "农用车"),
         VLR_DONGFANGHONG(228, "东方红"),
         VLR_STEYR(229, "斯太尔汽车"),
-        VLR_HONGQI(230, "红旗");
+        VLR_HONGQI(230, "红旗"),
+        VBR_CAR_AC(1025, "AC_Schnitzer"),
+        VBR_CAR_ALFA(1026, "阿尔法罗密欧"),
+        VBR_CAR_ASTONMARTIN(1027, "阿斯顿马丁"),
+        VBR_CAR_AUDI(1028, "奥迪"),
+        VBR_CAR_BUFORI(1029, "保斐利"),
+        VBR_CAR_PORSCHE(1030, "保时捷"),
+        VBR_CAR_BUICK(1031, "别克"),
+        VBR_CAR_BEIJING(1032, "北京汽车"),
+        VBR_CAR_BAW(1033, "北汽制造"),
+        VBR_CAR_BQWEIWANG(1034, "北汽威旺"),
+        VBR_CAR_BQYINXIANG(1035, "北汽银翔"),
+        VBR_CAR_BENZ(1036, "奔驰"),
+        VBR_CAR_BMW(1037, "宝马"),
+        VBR_CAR_BAOJUN(1038, "宝骏"),
+        VBR_CAR_BAOLONG(1039, "宝龙"),
+        VBR_CAR_BINLI(1040, "宾利"),
+        VBR_CAR_BRABUS(1041, "巴博斯"),
+        VBR_CAR_BUGATTI(1042, "布加迪"),
+        VBR_CAR_HONDA(1043, "本田"),
+        VBR_CAR_PEUGEOT(1044, "标致"),
+        VBR_CAR_BYD(1045, "比亚迪"),
+        VBR_CAR_CHANGHE(1046, "昌河"),
+        VBR_CAR_CHANGFENG(1047, "长丰猎豹"),
+        VBR_CAR_GREATWALL(1048, "长城"),
+        VBR_CAR_CHANGAN(1049, "长安轿车"),
+        VBR_CAR_DS(1050, "DS"),
+        VBR_CAR_SOUEAST(1051, "东南"),
+        VBR_CAR_VOLKSWAGEN(1053, "大众"),
+        VBR_CAR_DADI(1054, "大迪"),
+        VBR_CAR_DITELV(1055, "底特律电动车"),
+        VBR_CAR_DODGE(1056, "道奇"),
+        VBR_CAR_DUST(1057, "大地"),
+        VBR_CAR_DAFA(1059, "大发"),
+        VBR_CAR_TOYOTA(1060, "丰田"),
+        VBR_CAR_FUQI(1061, "富奇"),
+        VBR_CAR_FORNASARI(1062, "弗那萨利"),
+        VBR_CAR_FALALI(1063, "法拉利"),
+        VBR_CAR_FORD(1064, "福特"),
+        VBR_CAR_FODAY(1066, "福迪"),
+        VBR_CAR_FIAT(1067, "菲亚特"),
+        VBR_CAR_FISKER(1068, "菲斯克"),
+        VBR_CAR_GUANGGANG(1069, "光冈"),
+        VBR_CAR_GZYUNBAO(1070, "广州云豹"),
+        VBR_CAR_TRUMPCHE(1071, "广汽传祺"),
+        VBR_CAR_GUANGSHENG(1073, "广生"),
+        VBR_CAR_GUANZHI(1074, "观致"),
+        VBR_CAR_HUABE(1075, "华北"),
+        VBR_CAR_SMA(1076, "华普"),
+        VBR_CAR_HAWTAI(1077, "华泰"),
+        VBR_CAR_HAFEI(1078, "哈飞"),
+        VBR_CAR_HUMMER(1079, "悍马"),
+        VBR_CAR_HAIMA(1080, "海马"),
+        VBR_CAR_HONGQI(1081, "红旗"),
+        VBR_CAR_GEELY(1083, "吉利"),
+        VBR_CAR_JEEP(1084, "吉普"),
+        VBR_CAR_GAGUAR(1085, "捷豹"),
+        VBR_CAR_JIANGNAN(1086, "江南"),
+        VBR_CAR_CHRYSLER(1088, "克莱斯勒"),
+        VBR_CAR_CADILLAC(1089, "凯迪拉克"),
+        VBR_CAR_CARISSON(1090, "卡尔森"),
+        VBR_CAR_KANDI(1091, "康迪电动汽车"),
+        VBR_CAR_KOENIGSEGG(1092, "柯尼赛格"),
+        VBR_CAR_LAMBORGHINI(1093, "兰博基尼"),
+        VBR_CAR_LIFAN(1094, "力帆"),
+        VBR_CAR_ROLLSROYCE(1095, "劳斯莱斯"),
+        VBR_CAR_LINCOLN(1096, "林肯"),
+        VBR_CAR_EVERUS(1097, "理念"),
+        VBR_CAR_LOTUS(1098, "莲花"),
+        VBR_CAR_LANCIA(1099, "蓝旗亚"),
+        VBR_CAR_LOTUSNYO(1100, "路特斯"),
+        VBR_CAR_LANDROVER(1101, "路虎"),
+        VBR_CAR_SUZUKI(1102, "铃木"),
+        VBR_CAR_LUFENG(1103, "陆风"),
+        VBR_CAR_LEXUS(1104, "雷克萨斯"),
+        VBR_CAR_RENAULT(1105, "雷诺"),
+        VBR_CAR_MG(1106, "MG"),
+        VBR_CAR_MINI(1107, "MINI"),
+        VBR_CAR_MASERATI(1108, "玛莎拉蒂"),
+        VBR_CAR_MEIYA(1109, "美亚"),
+        VBR_CAR_MCLAREN(1110, "迈凯伦"),
+        VBR_CAR_MAYBACH(1111, "迈巴赫"),
+        VBR_CAR_MAZDA(1112, "马自达"),
+        VBR_CAR_MOGEN(1113, "摩根"),
+        VBR_CAR_LUXGEN(1114, "纳智捷"),
+        VBR_CAR_NANJINGJINLONG(1115, "南京金龙"),
+        VBR_CAR_OPEL(1116, "欧宝"),
+        VBR_CAR_OGA(1117, "讴歌"),
+        VBR_CAR_PGO(1118, "PGO"),
+        VBR_CAR_VENUCIA(1119, "启辰"),
+        VBR_CAR_CHERY(1120, "奇瑞"),
+        VBR_CAR_KIA(1121, "起亚"),
+        VBR_CAR_QIANTU(1122, "前途"),
+        VBR_CAR_NISSAN(1123, "日产"),
+        VBR_CAR_RUILIN(1124, "瑞麒"),
+        VBR_CAR_ROEWE(1125, "荣威"),
+        VBR_CAR_RUHU(1126, "如虎"),
+        VBR_CAR_SMART(1127, "Smart"),
+        VBR_CAR_MITSUBISHI(1128, "三菱"),
+        VBR_CAR_DATONG(1129, "上汽大通"),
+        VBR_CAR_SPYKER(1130, "世爵"),
+        VBR_CAR_SHUANGHUAN(1131, "双环"),
+        VBR_CAR_SHUANGLONG(1132, "双龙"),
+        VBR_CAR_SUBARU(1133, "斯巴鲁"),
+        VBR_CAR_SKODA(1134, "斯柯达"),
+        VBR_CAR_SAAB(1135, "萨博"),
+        VBR_CAR_SIMING(1136, "思铭"),
+        VBR_CAR_SIDATAIKE(1137, "斯达泰克"),
+        VBR_CAR_TIANMA(1138, "天马"),
+        VBR_CAR_TESLA(1139, "特斯拉"),
+        VBR_CAR_TAIKATE(1140, "泰卡特"),
+        VBR_CAR_TENGSHI(1141, "腾势"),
+        VBR_CAR_WEIZIMAN(1142, "威兹曼"),
+        VBR_CAR_WEILIN(1143, "威麟"),
+        VBR_CAR_VOLVO(1144, "沃尔沃"),
+        VBR_CAR_WEICHAIYINGZHI(1145, "潍柴英致"),
+        VBR_CAR_XINKAI(1146, "新凯"),
+        VBR_CAR_NEWDADI(1147, "新大地"),
+        VBR_CAR_NEWYATU(1148, "新雅途"),
+        VBR_CAR_HYUNDAI(1149, "现代"),
+        VBR_CAR_XIYATE(1150, "西雅特"),
+        VBR_CAR_CHEVROLET(1151, "雪佛兰"),
+        VBR_CAR_CITROEN(1152, "雪铁龙"),
+        VBR_CAR_JONWAY(1154, "永源"),
+        VBR_CAR_YINGTENUODI(1155, "英特诺帝"),
+        VBR_CAR_INFINITI(1156, "英菲尼迪"),
+        VBR_CAR_YEMA(1157, "野马"),
+        VBR_CAR_YOUXIA(1158, "游侠"),
+        VBR_CAR_YUJIE(1159, "御捷"),
+        VBR_CAR_ZTE(1160, "中兴"),
+        VBR_CAR_ZHONGHUA(1161, "中华"),
+        VBR_CAR_HUABEI(1162, "中客华北"),
+        VBR_CAR_ZOTYE(1163, "众泰"),
+        VBR_CAR_ZHIDOU(1164, "知豆"),
+        VBR_CAR_KAIYI(1165, "凯翼"),
+        VBR_CAR_HUASONG(1166, "华颂"),
+        VBR_CAR_JX50L(1167, "江西五十铃"),
+        VBR_CAR_BAOWO(1168, "宝沃"),
+        VBR_CAR_SQTONGJIA(1169, "陕汽通家"),
+        VBR_CAR_HANJIANG(1170, "汉江"),
+        VBR_CAR_ZHINUO(1171, "之诺"),
+        VBR_CAR_LUDIFANGZHOU(1172, "陆地方舟"),
+        VBR_CAR_HANTENG(1173, "汉腾"),
+        VBR_CAR_LEIDING(1174, "雷丁"),
+        VBR_CAR_CHANGJIANG(1175, "长江"),
+        VBR_CAR_SIWEI(1176, "斯威"),
+        VBR_CAR_FUQIQITENG(1177, "福汽启腾"),
+        VBR_CAR_GUANZHIQICHE(1178, "观致汽车"),
+        VBR_CAR_YUSHENG(1179, "驭胜"),
+        VBR_CAR_BISU(1180, "比速"),
+        VBR_CAR_CHANGANKUAYUE(1181, "长安跨越"),
+        VBR_CAR_HAIMASHANGWUCHE(1182, "海马商务车"),
+        VBR_CAR_WEICHAIOURUI(1183, "潍柴欧睿"),
+        VBR_TRUCK_ANKAI(1537, "安凯"),
+        VBR_TRUCK_ANYUAN(1538, "安源"),
+        VBR_TRUCK_BEIJINGNONGYONG(1539, "北京农用"),
+        VBR_TRUCK_BEIBENZHONGQI(1540, "北奔重汽"),
+        VBR_TRUCK_BEIFANGKECHE(1541, "北方客车"),
+        VBR_TRUCK_DRAGON(1544, "霸龙"),
+        VBR_TRUCK_CHENGGONG(1546, "成功"),
+        VBR_TRUCK_CHANGLONG(1547, "常隆"),
+        VBR_TRUCK_CHANA(1549, "长安商用"),
+        VBR_TRUCK_DONGFENG(1552, "东风"),
+        VBR_TRUCK_DAEWOO(1554, "大宇"),
+        VBR_TRUCK_DAYUN(1555, "大运"),
+        VBR_TRUCK_DIMAYUNCHAOCHE(1556, "迪马"),
+        VBR_TRUCK_DONGWO(1557, "东沃"),
+        VBR_TRUCK_FOTON(1559, "福田"),
+        VBR_TRUCK_GMC(1561, "GMC"),
+        VBR_TRUCK_GONOW(1562, "广汽吉奥"),
+        VBR_RIYECAR_270YXILIE(1563, "广汽日野轻卡"),
+        VBR_TRUCK_RIYETRUCK(1564, "广汽日野重卡"),
+        VBR_TRUCK_HUALING(1566, "华菱"),
+        VBR_TRUCK_HAFEI(1568, "恒天汽车"),
+        VBR_TRUCK_HENGTONGKECHE(1569, "恒通客车"),
+        VBR_TRUCK_HUIZHONG(1570, "汇众"),
+        VBR_TRUCK_HIGER(1571, "海格"),
+        VBR_TRUCK_HAIO(1573, "海欧"),
+        VBR_TRUCK_HANGTIANYUANTONG(1574, "航天圆通"),
+        VBR_TRUCK_HANGTIAN(1575, "航天"),
+        VBR_TRUCK_HUANGHAI(1576, "黄海"),
+        VBR_TRUCK_HEIBAO(1577, "黑豹"),
+        VBR_TRUCK_JIULONG(1578, "九龙"),
+        VBR_TRUCK_JAC(1579, "江淮"),
+        VBR_TRUCK_JIANGHUAN(1580, "江环"),
+        VBR_TRUCK_JMC(1581, "江铃"),
+        VBR_TRUCK_JMCCAR(1582, "江铃(作废)"),
+        VBR_TRUCK_JINLU(1583, "金旅客车"),
+        VBR_TRUCK_JINBEI(1584, "金杯"),
+        VBR_TRUCK_JINLONG(1585, "金龙"),
+        VBR_TRUCK_KAMA(1586, "凯马"),
+        VBR_TRUCK_KAWEI(1587, "卡威"),
+        VBR_TRUCK_KARRY(1588, "开瑞"),
+        VBR_TRUCK_UNION(1590, "联合"),
+        VBR_TRUCK_MANJITUAN(1592, "曼集团"),
+        VBR_TRUCK_FARMCAR(1594, "农用车"),
+        VBR_TRUCK_NANJINGNAVECO(1595, "南京依维柯"),
+        VBR_TRUCK_NANJUN(1596, "南骏"),
+        VBR_TRUCK_QINGLING(1597, "庆铃"),
+        VBR_TRUCK_YOUNG(1598, "青年汽车"),
+        VBR_TRUCK_SANY(1599, "三一重工"),
+        VBR_TRUCK_STOM(1600, "三环十通"),
+        VBR_TRUCK_HONGYAN(1603, "上汽依维柯红岩"),
+        VBR_TRUCK_SHANGRAO(1604, "上饶客车"),
+        VBR_TRUCK_SHILI(1605, "实力客车"),
+        VBR_TRUCK_SHAOLIN(1606, "少林客车"),
+        VBR_TRUCK_ERA(1607, "时代汽车"),
+        VBR_TRUCK_FENGLING(1608, "时风"),
+        VBR_TRUCK_SUNWIN(1609, "申沃"),
+        VBR_TRUCK_SHENLONG(1610, "申龙客车"),
+        VBR_TRUCK_SHENYE(1611, "神野"),
+        VBR_TRUCK_SHUCHI(1612, "舒驰客车"),
+        VBR_TRUCK_SHANQI(1613, "陕汽"),
+        VBR_TRUCK_SCANIA(1614, "斯堪尼亚"),
+        VBR_TRUCK_TKING(1615, "唐骏"),
+        VBR_TRUCK_TAIHU(1616, "太湖客车"),
+        VBR_TRUCK_TONGXINQICHE(1618, "同心汽车"),
+        VBR_TRUCK_WANFENG(1619, "万丰"),
+        VBR_TRUCK_WUZHENG(1620, "五征"),
+        VBR_TRUCK_SGMW(1621, "五菱"),
+        VBR_TRUCK_WUYI(1622, "武夷"),
+        VBR_TRUCK_WUHUAN(1624, "五环"),
+        VBR_TRUCK_XUGONG(1626, "徐工"),
+        VBR_TRUCK_FAW(1629, "一汽"),
+        VBR_TRUCK_YAXING(1630, "亚星"),
+        VBR_TRUCK_NAVECO(1631, "依维柯"),
+        VBR_TRUCK_YOUYI(1632, "友谊客车"),
+        VBR_TRUCK_YUTONG(1633, "宇通"),
+        VBR_TRUCK_YANGZI(1634, "扬子"),
+        VBR_TRUCK_YANTAI(1635, "燕台"),
+        VBR_TRUCK_YUEJIN(1636, "跃进"),
+        VBR_TRUCK_YINGTIAN(1637, "英田"),
+        VBR_TRUCK_CNHTC(1639, "中国重汽"),
+        VBR_TRUCK_ZHONGTONG(1641, "中通客车"),
+        VBR_TRUCK_ZHONGSHUN(1642, "中顺"),
+        VBR_TRUCK_CDW(1643, "重汽王牌"),
+        VBR_TRUCK_ZHONGDA(1644, "中大"),
+        VBR_TRUCK_GUANGTONGKECHE(1645, "广通客车"),
+        VBR_TRUCK_JINGGONGZHONGKA(1646, "精功重卡"),
+        VBR_TRUCK_WUZHOULONG(1647, "五洲龙"),
+        VBR_TRUCK_GONGLUKECHE(1648, "客车"),
+        VBR_TRUCK_MUDAN(1652, "牡丹汽车"),
+        VBR_TRUCK_CHUFENG(1653, "楚风汽车"),
+        VBR_TRUCK_JIJIANG(1654, "吉江"),
+        VBR_TRUCK_YIZHENG(1655, "上汽仪征"),
+        VBR_TRUCK_YUEXI(1656, "越西汽车"),
+        VBR_TRUCK_SHENMA(1657, "神马汽车"),
+        VBR_TRUCK_JXXIAOFANG(1658, "江西消防"),
+        VBR_TRUCK_SHUNFENG(1659, "顺丰汽车"),
+        VBR_TRUCK_HENGSHAN(1660, "衡山汽车"),
+        VBR_TRUCK_DONGFANGHONG(1674, "东方红"),
+        VBR_TRUCK_NEOPLAN(1675, "尼奥普兰"),
+        VBR_TRUCK_QINGQI(1676, "轻骑"),
+        VBR_BACK_TRUCK1(1677, "卡车"),
+        VBR_BACK_TRUCK2(1678, "特型车"),
+        VBR_BACK_TRUCK3(1679, "拖车"),
+        VBR_TRUCK_WANDA(1681, "万达客车"),
+        VBR_TRUCK_SCXIANDAI(1684, "四川现代"),
+        VBR_TRUCK_AOCHI(1685, "奥驰"),
+        VBR_TRUCK_JUNWEIKC(1686, "骏威客车"),
+        VBR_TRUCK_YIQILIUTE(1687, "一汽柳特"),
+        VBR_TRUCK_WANXIANG(1688, "万象"),
+        VBR_TRUCK_LIFANSHIJUN(1690, "力帆时骏"),
+        VBR_TRUCK_CHANGAN(1691, "长安"),
+        VBR_TRUCK_ZOOMLION(1692, "中联重工"),
+        VBR_TRUCK_YINLONG(1693, "银隆"),
+        VBR_TRUCK_JIACHUAN(1694, "嘉川汽车"),
+        VBR_TRUCK_YIXING(1695, "沂星"),
+        VBR_TRUCK_XIWO(1696, "西沃"),
+        VBR_TRUCK_YANGZIJIANG(1697, "扬子江"),
+        VBR_TRUCK_SUITONG(1698, "穗通"),
+        VBR_TRUCK_QINGDAOJIEFANG(1701, "青岛解放"),
+        VBR_TRUCK_ZHONGTIANFANGCHE(1702, "中天房车"),
+        VBR_TRUCK_GUILIN(1683, "桂林"),
+        VBR_TRUCK_THREEWHEEL(1602, "三轮车"),
+        VBR_TRUCK_CHUNLAN(1548, "春兰汽车"),
+        VBR_TRUCK_CHANGANLINGMU(1682, "长安铃木"),
+        VBR_TRUCK_PIKA(1651, "皮卡");
 
         private final int value;
         private final String brand;

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

@@ -36,6 +36,9 @@ public class CarDetect implements HCNetSDK.FMSGCallBack_V31 {
                 try {
                     // 获取结果
                     Map<String, Object> data = hikService.getPlateResultData(pAlarmInfo);
+                    if (null == data) {
+                        break;
+                    }
 
                     // 上传到主服务
                     log.info("准备上传车辆数据到主服务...");

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

@@ -36,8 +36,8 @@ public class Monitor extends Thread {
                     if (success) break;
 
                     try {
-                        // 1min 重试
-                        Thread.sleep(60000);
+                        // 0.5min 重试
+                        Thread.sleep(30000);
                     } catch (InterruptedException e) {}
                 }
             }
@@ -45,8 +45,8 @@ public class Monitor extends Thread {
             lastResult = netOk;
 
             try {
-                // 5min 重新执行
-                Thread.sleep(300000);
+                // 0.5min 重新执行
+                Thread.sleep(30000);
             } catch (InterruptedException e) {}
         }
     }

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

@@ -95,6 +95,9 @@ public class PersonDetect implements HCNetSDK.FMSGCallBack_V31 {
                 try {
                     // 获取数据
                     Map<String, Object> data = hikService.getSnapMatchData(pAlarmInfo);
+                    if (null == data) {
+                        return true;
+                    }
 
                     // 上传到主服务
                     log.info("准备上传比对数据到主服务...");

src/main/resources/application.properties

@@ -1,20 +1,20 @@
 # 注: 本项目不支持 yml 等其他 spring 支持的配置格式
 # 系统服务
-server.port=8081
+server.port=8082
 
 # 设备信息
-device.id=98
-device.name=车辆
+device.id=215
+device.name=人脸
 device.loginUser=admin
 device.password=huiju999
-device.ip=192.168.0.98
+device.ip=192.168.1.215
 device.port=8000
 # 支持人脸识别 1 支持, 0 不支持
 device.afr=0
 # 1-人脸识别相机,  2-车辆识别相机
-device.type=1
+device.type=2
 # 仅抓拍人脸
-device.faceonly = true
+device.faceonly = false
 
 # 静态文件
 assets.images=
@@ -22,10 +22,14 @@ assets.video=
 assets.dir=E:\\files
 
 # 服务相关
-api.mainbiz=http://127.0.0.1:8080
+api.mainbiz=https://welcome.ycjcjy.com/api
 api.current=http://127.0.0.1
-api.websocket=ws://127.0.0.1:8080/ws
+api.websocket=wss://welcome.ycjcjy.com/ws
 
 # 海康相关
 hik.dlldir=E:\\JavaProjects\\welcome3.0\\hardware\\hklib
-hik.facelib=0
+hik.facelib=0
+
+# 是否记录日志, 不填则代表不写日志
+# 日志路径会拼在 hik.dlldir 后面。需要先手动创建好目录
+hik.log = \\logs

src/test/java/com/huiju/welcome/hardware/HardwareApplicationTests.java

@@ -1,16 +0,0 @@
-package com.huiju.welcome.hardware;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class HardwareApplicationTests {
-
-	@Test
-	public void contextLoads() {
-	}
-
-}

target/maven-archiver/pom.properties

@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.5.4
+version=V3.0.1
+groupId=com.huiju.welcome
+artifactId=hardware

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 E:\JavaProjects\welcome3.0\hardware\src\main\java\com\huiju\welcome\hardware\libs\NativeString.java
 E:\JavaProjects\welcome3.0\hardware\src\main\java\com\huiju\welcome\hardware\websocket\WSClient.java
 E:\JavaProjects\welcome3.0\hardware\src\main\java\com\huiju\welcome\hardware\hik\HIKSupplement.java
@@ -20,3 +21,27 @@ E:\JavaProjects\welcome3.0\hardware\src\main\java\com\huiju\welcome\hardware\lib
 E:\JavaProjects\welcome3.0\hardware\src\main\java\com\huiju\welcome\hardware\websocket\ISubcriber.java
 E:\JavaProjects\welcome3.0\hardware\src\main\java\com\huiju\welcome\hardware\service\PersonDetect.java
 E:\JavaProjects\welcome3.0\hardware\src\main\java\com\huiju\welcome\hardware\websocket\Client.java
+=======
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\controller\ResponseBean.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\HardwareApplication.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\libs\Rand.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\config\InitService.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\controller\CommController.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\websocket\Action.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\libs\Configer.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\websocket\WSServer.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\config\WebSocketConfig.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\websocket\ISubcriber.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\hik\HCNetSDK.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\service\HikService.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\hik\HIKSupplement.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\service\MainService.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\libs\Ping.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\service\CarDetect.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\service\PersonDetect.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\service\Monitor.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\websocket\Client.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\libs\NativeString.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\websocket\WSClient.java
+E:\CODE\hdware-welcome3\src\main\java\com\huiju\welcome\hardware\libs\APIUtil.java
+>>>>>>> 15d30b474e917ccde2912e51ebf27e4c2420bcb8

target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1 +0,0 @@
-E:\JavaProjects\welcome3.0\hardware\src\test\java\com\huiju\welcome\hardware\HardwareApplicationTests.java