bug fix

.idea/workspace.xml

@@ -6,6 +6,10 @@
   <component name="ChangeListManager">
     <list default="true" id="ad2fe330-f201-4a05-ab3f-71348d2d007b" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/MainService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/MainService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -90,11 +94,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
+      <file leaf-file-name="application.properties" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="567">
-              <caret line="27" column="37" selection-start-line="27" selection-start-column="37" selection-end-line="27" selection-end-column="37" />
+            <state relative-caret-position="63">
+              <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
             </state>
           </provider>
         </entry>
@@ -102,8 +106,17 @@
       <file leaf-file-name="PersonDetect.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="840">
-              <caret line="51" column="132" selection-start-line="51" selection-start-column="132" selection-end-line="51" selection-end-column="132" />
+            <state relative-caret-position="357">
+              <caret line="62" column="65" selection-start-line="62" selection-start-column="65" selection-end-line="62" selection-end-column="65" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Monitor.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/Monitor.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="630">
+              <caret line="34" column="51" selection-start-line="34" selection-start-column="51" selection-end-line="34" selection-end-column="51" />
             </state>
           </provider>
         </entry>
@@ -111,8 +124,8 @@
       <file leaf-file-name="HikService.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5985">
-              <caret line="313" column="60" selection-start-line="313" selection-start-column="60" selection-end-line="313" selection-end-column="60" />
+            <state relative-caret-position="531">
+              <caret line="457" column="26" selection-start-line="457" selection-start-column="21" selection-end-line="457" selection-end-column="26" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -120,20 +133,23 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="APIUtil.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java">
+      <file leaf-file-name="MainService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/MainService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="565">
-              <caret line="173" selection-start-line="173" selection-end-line="173" />
+            <state relative-caret-position="294">
+              <caret line="65" lean-forward="true" selection-start-line="65" selection-end-line="65" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
+      <file leaf-file-name="APIUtil.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1785">
-              <caret line="85" selection-start-line="85" selection-end-line="85" />
+            <state relative-caret-position="404">
+              <caret line="182" column="5" lean-forward="true" selection-start-line="182" selection-start-column="5" selection-end-line="182" selection-end-column="5" />
             </state>
           </provider>
         </entry>
@@ -141,8 +157,8 @@
       <file leaf-file-name="HCNetSDK.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="69783">
-              <caret line="3354" column="34" selection-start-line="3354" selection-start-column="23" selection-end-line="3354" selection-end-column="34" />
+            <state relative-caret-position="237">
+              <caret line="3462" column="31" selection-start-line="3462" selection-start-column="19" selection-end-line="3462" selection-end-column="31" />
             </state>
           </provider>
         </entry>
@@ -159,15 +175,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Configer.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Configer.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="147">
-              <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="WSServer.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSServer.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -284,14 +291,14 @@
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/Action.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/Monitor.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/MainService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/NativeString.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/controller/CommController.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/MainService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
       </list>
@@ -306,8 +313,8 @@
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="mavenHome" value="d:/apache-maven-3.5.4" />
-        <option name="userSettingsFile" value="d:\apache-maven-3.5.4\conf\settings.xml" />
+        <option name="mavenHome" value="D:/Application/apache-maven-3.6.0" />
+        <option name="userSettingsFile" value="D:\Application\apache-maven-3.6.0\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
     <option name="importingSettings">
@@ -359,26 +366,83 @@
           <expand>
             <path>
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="libs" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -397,7 +461,7 @@
     <property name="aspect.path.notification.shown" value="true" />
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1561449835132" />
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../service-welcome3" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../hardware - Copy" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="project.structure.last.edited" value="Artifacts" />
@@ -552,12 +616,12 @@
       <workItem from="1561451112799" duration="21614000" />
       <workItem from="1561692194101" duration="15054000" />
       <workItem from="1561966303564" duration="599000" />
-      <workItem from="1561970448786" duration="215000" />
+      <workItem from="1561970448786" duration="22120000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="263039000" />
+    <option name="totallyTimeSpent" value="284944000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1015" extended-state="6" />
@@ -572,8 +636,9 @@
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="4" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.499002" weight="0.54545456" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.499002" visible="true" weight="0.48460662" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32920536" />
+      <window_info anchor="bottom" id="Messages" order="9" sideWeight="0.499501" weight="0.336374" />
       <window_info anchor="right" id="Palette&#9;" order="9" />
       <window_info id="Image Layers" order="3" />
       <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.32920536" />
@@ -581,14 +646,13 @@
       <window_info anchor="bottom" id="Version Control" order="11" weight="0.32920536" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.22234891" />
       <window_info anchor="bottom" id="Spring" order="12" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.22234891" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.56898516" />
       <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49918962" visible="true" weight="0.23773988" />
       <window_info anchor="right" id="Bean Validation" order="12" weight="0.32995737" />
       <window_info id="Web" order="7" sideWeight="0.5008104" side_tool="true" weight="0.23353294" />
       <window_info anchor="right" id="Theme Preview" order="10" />
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info anchor="right" id="Flutter Inspector" order="4" />
-      <window_info anchor="bottom" id="Messages" order="9" sideWeight="0.499501" weight="0.336374" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -639,18 +703,16 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <option name="time" value="2" />
+    </breakpoint-manager>
+  </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="70434">
-          <caret line="3354" column="34" selection-start-line="3354" selection-start-column="23" selection-end-line="3354" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/NativeString.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1197">
@@ -747,6 +809,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="147">
           <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -771,27 +836,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/Monitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="34" column="51" selection-start-line="34" selection-start-column="51" selection-end-line="34" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/MainService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="302">
-          <caret line="43" selection-start-line="43" selection-end-line="43" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/InitService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="659">
           <caret line="44" column="27" selection-start-line="44" selection-start-column="27" selection-end-line="44" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -811,13 +862,6 @@
     </entry>
     <entry file="jar://D:/Application/jdk1.8.0_161/jre/lib/ext/nashorn.jar!/jdk/nashorn/internal/objects/NativeString.class" />
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.6.RELEASE/spring-web-5.1.6.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="840">
-          <caret line="51" column="132" selection-start-line="51" selection-start-column="132" selection-end-line="51" selection-end-column="132" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1785">
@@ -842,13 +886,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69783">
-          <caret line="3354" column="34" selection-start-line="3354" selection-start-column="23" selection-end-line="3354" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.6.RELEASE/spring-web-5.1.6.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="133">
@@ -870,20 +907,58 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="237">
+          <caret line="3462" column="31" selection-start-line="3462" selection-start-column="19" selection-end-line="3462" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="182" column="5" lean-forward="true" selection-start-line="182" selection-start-column="5" selection-end-line="182" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/Monitor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="630">
+          <caret line="34" column="51" selection-start-line="34" selection-start-column="51" selection-end-line="34" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="62" column="65" selection-start-line="62" selection-start-column="65" selection-end-line="62" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5985">
-          <caret line="313" column="60" selection-start-line="313" selection-start-column="60" selection-end-line="313" selection-end-column="60" />
+        <state relative-caret-position="531">
+          <caret line="457" column="26" selection-start-line="457" selection-start-column="21" selection-end-line="457" selection-end-column="26" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/MainService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="565">
-          <caret line="173" selection-start-line="173" selection-end-line="173" />
+        <state relative-caret-position="294">
+          <caret line="65" lean-forward="true" selection-start-line="65" selection-end-line="65" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="63">
+          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
         </state>
       </provider>
     </entry>

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

@@ -118,6 +118,8 @@ public class APIUtil {
                     buildFile(builder, (File) fieldValue, fieldName);
                 } else if (fieldValue instanceof FileInputStream) {
                     buildFileInputStream(builder, (FileInputStream) fieldValue, fieldName);
+                } else if (fieldValue instanceof byte[]) {
+                    buildFileBytes(builder, (byte [])fieldValue, fieldName);
                 } else if (fieldValue instanceof ByteBuffer) {
                     byte[] array = new byte[((ByteBuffer) fieldValue).remaining()];
                     ((ByteBuffer) fieldValue).get(array);
@@ -138,6 +140,8 @@ public class APIUtil {
                             byte[] array = new byte[((ByteBuffer) item).remaining()];
                             ((ByteBuffer) item).get(array);
                             buildFileBytes(builder, array, fieldName);
+                        } else if (item instanceof byte[]) {
+                            buildFileBytes(builder, (byte [])item, fieldName);
                         } else {
                             log.error("不支持的 form-data 类型 " + item.getClass());
                         }

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

@@ -243,6 +243,13 @@ public class HikService {
         hcNetSDK.NET_DVR_UploadClose(upHandle);
     }
 
+
+    /**
+     * 人脸检索 - 功能弃用，设备不支持
+     * @param image
+     * @return
+     * @throws Exception
+     */
     public String compareImage(byte[] image) throws Exception {
         // 0、获取人脸比对库能力集
         // NET_DVR_STDXMLConfig(GET /ISAPI/Intelligent/FDLib/capabilities)
@@ -434,6 +441,28 @@ public class HikService {
         return data;
     }
 
+    public Map<String, Object> getFace(Pointer pAlarmInfo) {
+        HCNetSDK.NET_VCA_FACESNAP_RESULT facesnapResult = new HCNetSDK.NET_VCA_FACESNAP_RESULT();
+        facesnapResult.write();
+
+        Pointer pFaceSnapInfo = facesnapResult.getPointer();
+        pFaceSnapInfo.write(0, pAlarmInfo.getByteArray(0, facesnapResult.size()), 0, facesnapResult.size());
+
+        facesnapResult.read();
+
+        // 人脸评分
+        if (facesnapResult.dwFacePicLen > 0) {
+            byte[] avatar = facesnapResult.pBuffer1.getByteArray(0, facesnapResult.dwFacePicLen);
+            int score = facesnapResult.dwFaceScore;
+            return new HashMap<String, Object>(){{
+                put("score", score);
+                put("avatar", avatar);
+            }};
+        }
+
+        return null;
+    }
+
     /**
      * 获取车辆识别信息
      * @param pAlarmInfo
@@ -450,7 +479,7 @@ public class HikService {
         HCNetSDK.NET_DVR_PLATE_INFO plateInfo = plateResult.struPlateInfo;
         String plateLicense = null;
         try {
-            plateLicense = new String(plateInfo.sLicense, "GBK").trim();
+            plateLicense = new String(plateInfo.sLicense, "GBK").trim().substring(1);
         } catch (UnsupportedEncodingException e) {
             log.error("获取车牌出错: {}", e.getMessage());
             e.printStackTrace();

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

@@ -42,6 +42,17 @@ public class MainService {
         checkResult(resJSON);
     }
 
+    /**
+     * 上传人脸
+     * @param data
+     * @throws Exception
+     */
+    public void uploadFace(Map<String, Object> data) throws Exception {
+        String url = api + "/camera/"+ deviceId +"/face";
+        String resJSON = APIUtil.fetch("POST", url, null, null, data, null);
+        checkResult(resJSON);
+    }
+
     /**
      * 车辆识别
      * @param data

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

@@ -2,6 +2,7 @@ package com.huiju.welcome.hardware.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.huiju.welcome.hardware.libs.APIUtil;
+import com.huiju.welcome.hardware.libs.Configer;
 import com.huiju.welcome.hardware.websocket.Action;
 import com.sun.jna.NativeLong;
 import com.sun.jna.Pointer;
@@ -50,11 +51,31 @@ public class PersonDetect implements HCNetSDK.FMSGCallBack_V31 {
     // 海康回调
     @Override
     public boolean invoke(NativeLong lCommand, HCNetSDK.NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser) {
+        boolean faceOnly = Boolean.parseBoolean(Configer.pick("device.faceonly"));
 
         // 回调类型
         switch (lCommand.intValue()){
+            // 人脸抓拍
+            case HCNetSDK.COMM_UPLOAD_FACESNAP_RESULT:
+                if (faceOnly) {
+                    try {
+                        // 获取数据
+                        Map<String, Object> data = hikService.getFace(pAlarmInfo);
+
+                        // 上传到主服务
+                        log.info("准备上传人脸数据到主服务...");
+                        mainService.uploadFace(data);
+
+                        log.info("上传数据成功");
+                    } catch (Exception e) {
+                        log.error("上传数据失败: {}", e.getMessage());
+                        e.printStackTrace();
+                    }
+                }
             // 人脸黑名单比对报警
             case HCNetSDK.COMM_SNAP_MATCH_ALARM:
+                if (faceOnly) break;
+
                 try {
                     // 获取数据
                     Map<String, Object> data = hikService.getSnapMatchData(pAlarmInfo);

src/main/resources/application.properties

@@ -3,16 +3,18 @@
 server.port=8081
 
 # 设备信息
-device.id=200
+device.id=98
 device.name=车辆
 device.loginUser=admin
 device.password=huiju999
-device.ip=10.168.1.200
+device.ip=192.168.0.98
 device.port=8000
 # 支持人脸识别 1 支持, 0 不支持
 device.afr=0
 # 1-人脸识别相机,  2-车辆识别相机
-device.type=2
+device.type=1
+# 仅抓拍人脸
+device.faceonly = true
 
 # 静态文件
 assets.images=
@@ -25,4 +27,4 @@ api.current=http://127.0.0.1
 api.websocket=ws://127.0.0.1:8080/ws
 
 # 海康相关
-hik.dlldir=E:\\CODE\\hdware-welcome3\\hklib
+hik.dlldir=E:\\JavaProjects\\welcome3.0\\hardware\\hklib