Merge branch 'v5' of http://git.ycjcjy.com/welcome/hdware-welcome3 into v5

# Conflicts:
#	.idea/workspace.xml
#	src/main/resources/application.properties

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju.welcome</groupId>
 	<artifactId>hardware</artifactId>
-	<version>V3.0.1</version>
+	<version>V3.1.0</version>
 	<name>hardware</name>
 	<description>hardware app for huiju.com.welcome</description>
 

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

@@ -1,3 +1,4 @@
+
 package com.huiju.welcome.hardware.service;
 
 /**
@@ -52,6 +53,9 @@ public class HikService {
     // 回调类
     HCNetSDK.FMSGCallBack_V31 fmsgCallBack;
 
+    // 正在使用的人脸库
+    String faceLib;
+
     public boolean init() {
         String deviceIP = Configer.pick("device.ip");
 
@@ -66,6 +70,13 @@ public class HikService {
         if (!setDeviceAlarm()) return false;
         if (!setDeviceOnline()) return false;
 
+        try {
+            detectFaceLib();
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("探测人脸库失败: {}", e.getMessage());
+        }
+
         return true;
     }
 
@@ -203,14 +214,14 @@ public class HikService {
 
         String appendXML = "" +
                 "<FaceAppendData version=\"2.0\" xmlns=\"http://www.hikvision.com/ver20/XMLSchema\">\n" +
-                    "<name>"+ personId +"</name>\n" +
-                    "<PersonInfoExtendList>\n" +
-                        "<PersonInfoExtend>\n" +
-                            "<id>1</id>\n" +
-                            "<enable>false</enable>\n" +
-                        "</PersonInfoExtend>\n" +
-                    "</PersonInfoExtendList>\n" +
-                    "<customHumanID>\n"+personId+"</customHumanID>\n"+
+                "<name>"+ personId +"</name>\n" +
+                "<PersonInfoExtendList>\n" +
+                "<PersonInfoExtend>\n" +
+                "<id>1</id>\n" +
+                "<enable>false</enable>\n" +
+                "</PersonInfoExtend>\n" +
+                "</PersonInfoExtendList>\n" +
+                "<customHumanID>\n"+personId+"</customHumanID>\n"+
                 "</FaceAppendData>";
         byte[] appendDataBytes = appendXML.getBytes();
 
@@ -256,6 +267,79 @@ public class HikService {
         hcNetSDK.NET_DVR_UploadClose(upHandle);
     }
 
+    public void deleteFace(String personId) throws Exception {
+        // NET_DVR_STDXMLConfig(DELETE /ISAPI/Intelligent/FDLib/<FDID>/picture/<PID>)
+        HCNetSDK.NET_DVR_XML_CONFIG_INPUT lpInputParam0 = new HCNetSDK.NET_DVR_XML_CONFIG_INPUT();
+        lpInputParam0.dwSize = lpInputParam0.size();
+
+        String customFaceLibID = null == faceLib ? Configer.pick("hik.facelib") : faceLib;
+        String url = "DELETE /ISAPI/Intelligent/FDLib/"+customFaceLibID+"/picture/"+personId+"?FDType=custom\r\n";
+        HCNetSDK.BYTE_ARRAY ptrUrl = new HCNetSDK.BYTE_ARRAY(url.length());
+        System.arraycopy(url.getBytes(), 0, ptrUrl.byValue, 0, url.length());
+        ptrUrl.write();
+        lpInputParam0.lpRequestUrl = ptrUrl.getPointer();
+        lpInputParam0.dwRequestUrlLen = url.length();
+        lpInputParam0.write();
+
+        HCNetSDK.NET_DVR_XML_CONFIG_OUTPUT lpOutputParam0 = new HCNetSDK.NET_DVR_XML_CONFIG_OUTPUT();
+        lpOutputParam0.dwSize = lpOutputParam0.size();
+        HCNetSDK.BYTE_ARRAY ptrOutByte = new HCNetSDK.BYTE_ARRAY(HCNetSDK.ISAPI_DATA_LEN);
+        lpOutputParam0.lpOutBuffer = ptrOutByte.getPointer();
+        lpOutputParam0.dwOutBufferSize = HCNetSDK.ISAPI_DATA_LEN;
+        lpOutputParam0.write();
+
+        if (!hcNetSDK.NET_DVR_STDXMLConfig(user, lpInputParam0, lpOutputParam0)) {
+            String error = getHcNetError();
+            log.error("删除人脸失败: {}", error);
+            throw new Exception(error);
+        }
+        return;
+    }
+
+    public void detectFaceLib() throws Exception {
+        HCNetSDK.NET_DVR_XML_CONFIG_INPUT lpInputParam0 = new HCNetSDK.NET_DVR_XML_CONFIG_INPUT();
+        lpInputParam0.dwSize = lpInputParam0.size();
+
+        String url = "GET /ISAPI/Intelligent/FDLib\r\n";
+        HCNetSDK.BYTE_ARRAY ptrUrl = new HCNetSDK.BYTE_ARRAY(url.length());
+        System.arraycopy(url.getBytes(), 0, ptrUrl.byValue, 0, url.length());
+        ptrUrl.write();
+        lpInputParam0.lpRequestUrl = ptrUrl.getPointer();
+        lpInputParam0.dwRequestUrlLen = url.length();
+        lpInputParam0.write();
+
+        HCNetSDK.NET_DVR_XML_CONFIG_OUTPUT lpOutputParam0 = new HCNetSDK.NET_DVR_XML_CONFIG_OUTPUT();
+        lpOutputParam0.dwSize = lpOutputParam0.size();
+        HCNetSDK.BYTE_ARRAY ptrOutByte = new HCNetSDK.BYTE_ARRAY(HCNetSDK.ISAPI_DATA_LEN);
+        lpOutputParam0.lpOutBuffer = ptrOutByte.getPointer();
+        lpOutputParam0.dwOutBufferSize = HCNetSDK.ISAPI_DATA_LEN;
+        lpOutputParam0.write();
+
+        if (!hcNetSDK.NET_DVR_STDXMLConfig(user, lpInputParam0, lpOutputParam0)) {
+            String error = getHcNetError();
+            log.error("检测人脸库失败: {}", error);
+        }
+
+        byte[] fDSearchResult = lpOutputParam0.lpOutBuffer.getByteArray(0, lpOutputParam0.dwOutBufferSize);
+        // https://dom4j.github.io/javadoc/2.1.1/overview-summary.html
+        String xml = new String(fDSearchResult, "GBK");
+        Document document = DocumentHelper.parseText(xml);
+        Element root = document.getRootElement();
+        for (Iterator<Element> it = root.elementIterator("FDLibBaseCfg"); it.hasNext();) {
+            Element fDLibBaseCfg = it.next();
+            Element nameNode = fDLibBaseCfg.element("name");
+            if ("default".equals(nameNode.getStringValue())) {
+                Element fdidNode = fDLibBaseCfg.element("FDID");
+                faceLib = fdidNode.getStringValue();
+
+                // todo
+                // 反写配置文件
+
+                break;
+            }
+        }
+    }
+
 
     /**
      * 人脸检索 - 功能弃用，设备不支持

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

@@ -48,6 +48,22 @@ public class PersonDetect implements HCNetSDK.FMSGCallBack_V31 {
         }
     }
 
+    public void deleteFace(Action message) {
+        JSONObject data = (JSONObject) message.getPayload();
+        String personId = data.getString("personId");
+        if (null == personId || "".equals(personId.trim())) {
+            log.error("删除人脸ID不能为空");
+            return;
+        }
+
+        try {
+            hikService.deleteFace(personId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("删除人脸失败: {}", e.getMessage());
+        }
+    }
+
     // 海康回调
     @Override
     public boolean invoke(NativeLong lCommand, HCNetSDK.NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser) {

src/main/java/com/huiju/welcome/hardware/websocket/Action.java

@@ -9,6 +9,7 @@ public class Action {
     public final static String TYPE_DEFAULT = "default";
     public final static String TYPE_ACK = "ack";
     public final static String TYPE_DISPATCH_FACE = "dispatch-face";
+    public final static String TYPE_DELETE_FACE = "delete-face";
     public final static String TYPE_TO_FRONT = "to-front";
 
     public final static String ACK_SUCCESS = "success";

src/main/java/com/huiju/welcome/hardware/websocket/WSClient.java

@@ -48,6 +48,9 @@ public class WSClient implements ISubcriber {
                     Action ack = personDetect.dispatchFace(message);
                     send(ack);
                     break;
+                case Action.TYPE_DELETE_FACE:
+                    personDetect.deleteFace(message);
+                    break;
                 case Action.TYPE_TO_FRONT:
                     JSONObject data = (JSONObject) message.getPayload();
                     String to = data.getString("to");

src/main/resources/application.properties

@@ -3,18 +3,18 @@
 server.port=8082
 
 # 设备信息
-device.id=216
+device.id=215
 device.name=人脸
 device.loginUser=admin
 device.password=huiju999
-device.ip=192.168.0.17
+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,12 +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:\\hklib
+hik.dlldir=E:\\JavaProjects\\welcome3.0\\hardware\\hklib
+hik.facelib=0
+
 # 是否记录日志, 不填则代表不写日志
 # 日志路径会拼在 hik.dlldir 后面。需要先手动创建好目录
 hik.log = \\logs