From 396fe7c1ca0d952c79b9ed10dcffa35354e1e1fa Mon Sep 17 00:00:00 2001
From: haidong <chenloveguitar@qq.com>
Date: Sun, 8 Oct 2023 18:11:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=A7=E5=8D=8E=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: haidong <chenloveguitar@qq.com>
---
 src/main/java/com/yzx/impl/DaHua.java        | 41 +++++++++++++-------
 src/main/java/com/yzx/pojo/UserFaceInfo.java |  5 +--
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/yzx/impl/DaHua.java b/src/main/java/com/yzx/impl/DaHua.java
index 98b7ad4..e1741c3 100644
--- a/src/main/java/com/yzx/impl/DaHua.java
+++ b/src/main/java/com/yzx/impl/DaHua.java
@@ -133,18 +133,38 @@ public class DaHua implements IHardwareEquipment {
         return true;
     }
 
+    /**
+     * 添加或修改用户
+     * @return
+     */
+
+    public boolean addOrEditPersion(UserFaceInfo userFaceInfo){
+        this.login(info.getIp(),info.getPort(),info.getUsername(),info.getPassword());
+        //查询用户
+        String employeeNo = userFaceInfo.getEmployeeNo();
+        int recordNo = this.findRecordNo(employeeNo);
+        if(recordNo != 0){//编辑
+            if(this.updateUserCard(userFaceInfo) && this.updateUserFace(employeeNo,userFaceInfo.getImageBytes())){
+                return true;
+            }
+        }else{//添加
+            if(this.addUserCard(userFaceInfo) && this.updateUserFace(employeeNo,userFaceInfo.getImageBytes())){
+                return true;
+            }
+        }
+        this.logout();
+        return false;
+    }
+
     /**
      * 添加人脸
      * @param userId
      * @param imageBytes
      * @return
      */
-    public boolean addUserFace(String userId,byte[] imageBytes){
-        this.login(info.getIp(),info.getPort(),info.getUsername(),info.getPassword());
+    private boolean addUserFace(String userId,byte[] imageBytes){
         Memory memory = ToolKits.readPictureBytes(imageBytes);
         boolean b = GateModule.addFaceInfo(userId, memory);
-        //退出登录
-        this.logout();
         return b;
     }
 
@@ -154,12 +174,9 @@ public class DaHua implements IHardwareEquipment {
      * @param imageBytes
      * @return
      */
-    public boolean updateUserFace(String userId,byte[] imageBytes){
-        this.login(info.getIp(),info.getPort(),info.getUsername(),info.getPassword());
+    private boolean updateUserFace(String userId,byte[] imageBytes){
         Memory memory = ToolKits.readPictureBytes(imageBytes);
         boolean b = GateModule.modifyFaceInfo(userId, memory);
-        //退出登录
-        this.logout();
         return b;
     }
 
@@ -168,7 +185,7 @@ public class DaHua implements IHardwareEquipment {
      * @param userFaceInfo
      * @return
      */
-    public boolean addUserCard(UserFaceInfo userFaceInfo){
+    private boolean addUserCard(UserFaceInfo userFaceInfo){
         String employeeNo = userFaceInfo.getEmployeeNo();
         String employeeName = userFaceInfo.getEmployeeName();
         String startTime = userFaceInfo.getStartTime();
@@ -176,8 +193,6 @@ public class DaHua implements IHardwareEquipment {
         String cardNo = userFaceInfo.getCardNo();
         this.login(info.getIp(),info.getPort(),info.getUsername(),info.getPassword());
         boolean b = GateModule.insertCard(cardNo, employeeNo, employeeName, "", 0, 0, 0, 0, 1, startTime, endTime);
-        //退出登录
-        this.logout();
         return b;
     }
 
@@ -186,7 +201,7 @@ public class DaHua implements IHardwareEquipment {
      * @param userFaceInfo
      * @return
      */
-    public boolean updateUserCard(UserFaceInfo userFaceInfo){
+    private boolean updateUserCard(UserFaceInfo userFaceInfo){
 
         String employeeNo = userFaceInfo.getEmployeeNo();
         String employeeName = userFaceInfo.getEmployeeName();
@@ -198,8 +213,6 @@ public class DaHua implements IHardwareEquipment {
         int recordNo = this.findRecordNo(employeeNo);
 
         boolean b = GateModule.modifyCard(recordNo,cardNo, employeeNo, employeeName, "", 0, 0, 0, 0, 1, startTime, endTime);
-        //退出登录
-        this.logout();
         return b;
     }
 
diff --git a/src/main/java/com/yzx/pojo/UserFaceInfo.java b/src/main/java/com/yzx/pojo/UserFaceInfo.java
index 18891a7..bd64649 100644
--- a/src/main/java/com/yzx/pojo/UserFaceInfo.java
+++ b/src/main/java/com/yzx/pojo/UserFaceInfo.java
@@ -12,8 +12,5 @@ public class UserFaceInfo {
     private String startTime;//有效期开始
     private String endTime;//有效期结束
     private String cardNo;//卡号
-
-
-
-
+    private byte[] imageBytes;//人脸信息
 }