bug fix

.gitignore

@@ -0,0 +1,29 @@
+HELP.md
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+
+### VS Code ###
+.vscode/

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,114 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL =
+            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: : " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip

bak/pom.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.huiju.welcome</groupId>
+    <artifactId>hardware</artifactId>
+    <version>v3.0.0</version>
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.huiju.welcome.hardware.App</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptors>
+                        <descriptor>src/assembly/myassembly.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.sun.jna</groupId>
+            <artifactId>examples</artifactId>
+            <scope>system</scope>
+            <version>1.0</version>
+            <systemPath>${project.basedir}\src\main\resources\libs\examples.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>3.0.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.14.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.nanohttpd</groupId> <!-- <groupId>com.nanohttpd</groupId> for 2.1.0 and earlier -->
+            <artifactId>nanohttpd</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.56</version>
+        </dependency>
+    </dependencies>
+</project>

setting.conf → bak/setting.conf

@@ -7,3 +7,4 @@ port = 8000
 api = 
 hiklib = E:\\JavaProjects\\welcome3.0\\hardware\\hklib
 server = http://127.0.0.1:8080
+listen = 8001

src/assembly/myassembly.xml → bak/src/assembly/myassembly.xml

@@ -3,7 +3,7 @@
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
     <id>myassembly</id>
     <formats>
-        <format>jar</format>
+        <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <fileSets>
@@ -14,10 +14,10 @@
                 <include>setting.conf</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/libs</directory>
-            <outputDirectory>libs</outputDirectory>
-        </fileSet>
+        <!--<fileSet>-->
+            <!--<directory>${project.build.directory}/libs</directory>-->
+            <!--<outputDirectory>libs</outputDirectory>-->
+        <!--</fileSet>-->
     </fileSets>
     <dependencySets>
         <dependencySet>

bak/src/main/java/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.huiju.welcome.hardware.App
+

bak/src/main/java/com/huiju/welcome/hardware/App.java

@@ -0,0 +1,62 @@
+package com.huiju.welcome.hardware;
+
+import com.huiju.welcome.hardware.libs.Configer;
+import com.huiju.welcome.hardware.libs.TinyLog;
+import fi.iki.elonen.NanoHTTPD;
+
+import java.io.IOException;
+
+public class App extends NanoHTTPD {
+    static Camera camera;
+    static Monitor monitor = new Monitor();
+    static Configer conf = new Configer();
+
+    public App() throws IOException {
+        super(Integer.parseInt(conf.get("listen")));
+        start(NanoHTTPD.SOCKET_READ_TIMEOUT, false);
+        System.out.println("\nRunning! Point your browsers to http://localhost:"+conf.get("listen")+"/ \n");
+    }
+
+    public static void main(String[] args) {
+        TinyLog.info("开始读取配置文件...");
+
+        readConfiger("E:\\JavaProjects\\welcome3.0\\hardware\\setting.conf");
+
+        TinyLog.info("开始加载 dll 文件...");
+        camera = Camera.getInstance();
+        camera.setConfig(conf);
+        monitor.listen(camera, conf.get("ip"));
+
+        TinyLog.info("开始监听", conf.get("ip"));
+        monitor.start();
+`
+        TinyLog.info("开始进行接口初始化...");
+        camera.connect();
+
+        try {
+            new App();
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+            TinyLog.error("启动本服务失败: " + ioe.getMessage());
+        }
+    }
+
+    @Override
+    public Response serve(IHTTPSession session) {
+        String uri = session.getUri();
+        TinyLog.info( "接收到请求来自: " + uri);
+
+        // 暂时只开通一个功能
+        if (uri.indexOf("") == -1) {
+            return newFixedLengthResponse("");
+        }
+    }
+
+    private static void readConfiger(String f) {
+        String err = conf.read("E:\\JavaProjects\\welcome3.0\\hardware\\setting.conf");
+        if (null != err && !"".equals(err)) {
+            TinyLog.error("读取配置文件失败");
+            TinyLog.error(err);
+        }
+    }
+}

src/main/java/com/huiju/welcome/hardware/Camera.java → bak/src/main/java/com/huiju/welcome/hardware/Camera.java

@@ -3,9 +3,9 @@ package com.huiju.welcome.hardware;
 import com.sun.jna.NativeLong;
 import com.sun.jna.Pointer;
 import com.huiju.welcome.hardware.hik.HCNetSDK;
-import com.huiju.welcome.hardware.utils.Configer;
-import com.huiju.welcome.hardware.utils.Server;
-import com.huiju.welcome.hardware.utils.TinyLog;
+import com.huiju.welcome.hardware.libs.Configer;
+import com.huiju.welcome.hardware.libs.Server;
+import com.huiju.welcome.hardware.libs.TinyLog;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
@@ -139,7 +139,8 @@ public class Camera implements HCNetSDK.FMSGCallBack_V31 {
                 result.put("similarity", String.valueOf(strFaceSnapMatch.fSimilarity));
                 result.put("score", String.valueOf(strFaceSnapMatch.struSnapInfo.byFaceScore & 0xFF));
                 result.put("sex", String.valueOf(strFaceSnapMatch.struSnapInfo.bySex & 0xFF));
-                result.put("avatar", avatar);
+                result.put("snapshot", avatar);
+                result.put("deviceId", deviceID);
 
                 TinyLog.info("以下为本次比对结果:");
                 TinyLog.info("比对结果[0-保留，1-比对成功，2-比对失败]:", strFaceSnapMatch.byContrastStatus);
@@ -151,7 +152,7 @@ public class Camera implements HCNetSDK.FMSGCallBack_V31 {
                 if (strFaceSnapMatch.struBlackListInfo.dwBlackListPicLen > 0) {
                     try {
                         String personId = new String(strFaceSnapMatch.struBlackListInfo.struBlackListInfo.struAttribute.byName,"GBK").trim();
-                        result.put("sysperson", personId);
+                        result.put("matchPerson", personId);
                         TinyLog.info("比对人脸名称(业务库ID)", personId);
                     } catch (UnsupportedEncodingException e) {
                         TinyLog.error("获取比对人员ID失败");

src/main/java/com/huiju/welcome/hardware/Monitor.java → bak/src/main/java/com/huiju/welcome/hardware/Monitor.java

@@ -1,6 +1,6 @@
 package com.huiju.welcome.hardware;
 
-import com.huiju.welcome.hardware.utils.Ping;
+import com.huiju.welcome.hardware.libs.Ping;
 
 /**
  * 主要为了监控设备网络是否在线

src/main/java/com/huiju/welcome/hardware/utils/Configer.java → bak/src/main/java/com/huiju/welcome/hardware/utils/Configer.java

@@ -1,4 +1,4 @@
-package com.huiju.welcome.hardware.utils;
+package com.huiju.welcome.hardware.libs;
 
 import java.io.BufferedReader;
 import java.io.FileReader;

src/main/java/com/huiju/welcome/hardware/utils/Ping.java → bak/src/main/java/com/huiju/welcome/hardware/utils/Ping.java

@@ -1,4 +1,4 @@
-package com.huiju.welcome.hardware.utils;
+package com.huiju.welcome.hardware.libs;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/com/huiju/welcome/hardware/utils/Rand.java → bak/src/main/java/com/huiju/welcome/hardware/utils/Rand.java

@@ -1,4 +1,4 @@
-package com.huiju.welcome.hardware.utils;
+package com.huiju.welcome.hardware.libs;
 
 import java.util.Random;
 

src/main/java/com/huiju/welcome/hardware/utils/Server.java → bak/src/main/java/com/huiju/welcome/hardware/utils/Server.java

@@ -1,4 +1,4 @@
-package com.huiju.welcome.hardware.utils;
+package com.huiju.welcome.hardware.libs;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -69,17 +69,18 @@ public class Server {
         MultipartBody.Builder fmt = new MultipartBody.Builder();
         fmt.setType(MultipartBody.FORM);
         RequestBody reqBody = RequestBody.create(null, null, 0, 0);
-        String api = apiURL + "/device/compare";
+        String api = apiURL + "/camera/person";
 
+        final String[] fname = {null};
         data.forEach((k, v) -> {
             if (v instanceof String) {
                 fmt.addFormDataPart(k, (String)v);
             } else if (v instanceof ByteBuffer) {
-                String fname = getRandFileName(k, ".jpg");
+                fname[0] = getRandFileName(k, ".jpg");
 
                 try {
-                    buf2File((ByteBuffer)v, fname);
-                    fmt.addFormDataPart(k, fname, reqBody);
+                    buf2File((ByteBuffer)v, fname[0]);
+                    fmt.addFormDataPart(k, fname[0], reqBody);
                 } catch (IOException e) {
                     TinyLog.error("对比图片保存本地失败");
                     e.printStackTrace();
@@ -98,6 +99,7 @@ public class Server {
             if (!response.isSuccessful()) {
                 TinyLog.error("人脸比对结果上传失败");
                 TinyLog.error(response.message());
+                removeTmpFile(fname[0]);
                 return false;
             }
 
@@ -108,9 +110,11 @@ public class Server {
         } catch (IOException e) {
             TinyLog.error("人脸比对结果上传失败");
             e.printStackTrace();
+            removeTmpFile(fname[0]);
             return false;
         }
 
+        removeTmpFile(fname[0]);
         return true;
     }
 
@@ -143,4 +147,10 @@ public class Server {
     private String getRandFileName(String key, String ext) {
         return key + "-" + Rand.string(8) + ext;
     }
+
+    private void removeTmpFile(String fname) {
+        if (null == fname || "".equals(fname)) return;
+
+        new File(fname).delete();
+    }
 }

src/main/java/com/huiju/welcome/hardware/utils/TinyLog.java → bak/src/main/java/com/huiju/welcome/hardware/utils/TinyLog.java

@@ -1,4 +1,4 @@
-package com.huiju.welcome.hardware.utils;
+package com.huiju.welcome.hardware.libs;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;