bug fix

src/main/java/com.huiju.welcome/common/Action.java

@@ -13,6 +13,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 TYPE_NEW_MAIN_USHER = "new-main-usher";
     public final static String TYPE_NEW_FIRST_USHER = "new-first-usher";

src/main/java/com.huiju.welcome/mapper/TaFaceLibMapper.java

@@ -0,0 +1,10 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.welcome.model.TaFaceLib;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+public interface TaFaceLibMapper extends BaseMapper<TaFaceLib> {
+}

src/main/java/com.huiju.welcome/model/TaFaceLib.java

@@ -0,0 +1,33 @@
+package com.huiju.welcome.model;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaFaceLib implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    private String libCode;
+
+    private Integer localPerson;
+
+    private Integer localFace;
+
+    private String libPerson;
+
+    private String libFace;
+
+    private String deviceId;
+}

src/main/java/com.huiju.welcome/service/ICameraService.java

@@ -1,14 +1,13 @@
 package com.huiju.welcome.service;
 
-import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaDevice;
-import com.huiju.welcome.model.TaFirstUsherRecord;
-import com.huiju.welcome.model.TaMainUsherRecord;
 import com.huiju.welcome.model.TaPerson;
 import com.huiju.welcome.model.TaSnapshotPerson;
 
 public interface ICameraService {
     String dispatchPerson(TaPerson taPerson, TaDevice ...devices);
 
+    boolean deleteFace(Integer personId);
+
     boolean newPersonByDevice(TaSnapshotPerson taSnapshotPerson);
 }

src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huiju.welcome.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,19 +9,14 @@ import com.huiju.welcome.common.WebSocketServer;
 import com.huiju.welcome.mapper.SysUserMapper;
 import com.huiju.welcome.mapper.TaCustomerMapMapper;
 import com.huiju.welcome.mapper.TaCustomerMapper;
-import com.huiju.welcome.model.SysUser;
-import com.huiju.welcome.model.TaCustomer;
-import com.huiju.welcome.model.TaCustomerMap;
-import com.huiju.welcome.model.TaDevice;
-import com.huiju.welcome.model.TaFirstUsherRecord;
-import com.huiju.welcome.model.TaMainUsherRecord;
-import com.huiju.welcome.model.TaPerson;
-import com.huiju.welcome.model.TaSnapshotPerson;
+import com.huiju.welcome.mapper.TaFaceLibMapper;
+import com.huiju.welcome.model.*;
 import com.huiju.welcome.service.*;
 import com.huiju.welcome.utils.*;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
 import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -38,6 +34,9 @@ import java.util.Map;
 @Slf4j
 @Service
 public class CameraServiceImpl implements ICameraService {
+    final static String HIK_FACE_LIB = "hik-face";
+    final static String ALI_FACE_LIB = "ali-face";
+
     @Autowired
     private ITaDeviceService taDeviceService;
 
@@ -71,6 +70,9 @@ public class CameraServiceImpl implements ICameraService {
     @Autowired
     private SysUserMapper sysUserMapper;
 
+    @Autowired
+    private TaFaceLibMapper taFaceLibMapper;
+
     @Autowired
     private IMessageService iMessageService;
     
@@ -99,6 +101,16 @@ public class CameraServiceImpl implements ICameraService {
                 Action act = Action.create(Action.TYPE_DISPATCH_FACE, payload);
 
                 WebSocketServer.sendInfo(act.toJSON(), "device", device.getDeviceId());
+
+                // 假设海康设备下发成功
+                TaFaceLib taFaceLib = new TaFaceLib();
+                taFaceLib.setLocalPerson(taPerson.getPersonId());
+                taFaceLib.setLibCode(HIK_FACE_LIB);    // 海康设备
+                taFaceLib.setLibPerson(taPerson.getPersonId().toString());
+                taFaceLib.setLibFace(taPerson.getPersonId().toString());
+                taFaceLib.setDeviceId(device.getDeviceId());
+                taFaceLibMapper.insert(taFaceLib);
+
             } catch (Exception e){
                 e.printStackTrace();
                 return "连接设备(" + device.getDeviceId() + ")人脸下发服务 失败: "+ e.getMessage();
@@ -114,7 +126,27 @@ public class CameraServiceImpl implements ICameraService {
 //        }
 
         try {
-            aliFaceUtils.createFace(String.valueOf(taPerson.getRealId()), taPerson.getAvatar());
+            JSONObject result = aliFaceUtils.createFace(String.valueOf(taPerson.getRealId()), taPerson.getAvatar());
+            if (null != result && result.getInteger("code") == HttpStatus.SC_OK) {
+                JSONArray faceImageItems = result.getJSONArray("faceImageItems");
+                if (null != faceImageItems && faceImageItems.size() > 0) {
+                    JSONObject faceInfo = faceImageItems.getJSONObject(0);
+//                    Double faceId = faceInfo.getDouble("faceId");     // 阿里返回值是一个 double 类型
+                    String faceId = faceInfo.getString("faceId");
+
+                    //
+                    TaFaceLib taFaceLib = new TaFaceLib();
+                    taFaceLib.setLocalPerson(taPerson.getPersonId());
+                    taFaceLib.setLibCode(ALI_FACE_LIB);    // 海康设备
+                    taFaceLib.setLibPerson(taPerson.getPersonId().toString());
+                    taFaceLib.setLibFace(faceId);
+//                    taFaceLib.setDeviceId();
+                    taFaceLibMapper.insert(taFaceLib);
+                }
+
+            } else {
+                log.error("下发人脸到阿里云失败: 原因未知");
+            }
         } catch (Exception e) {
             e.printStackTrace();
             log.error("下发人脸到阿里云失败: " + e.getMessage());
@@ -123,6 +155,45 @@ public class CameraServiceImpl implements ICameraService {
         return "";
     }
 
+    @Override
+    public boolean deleteFace(Integer personId) {
+        QueryWrapper<TaFaceLib> wrapper = new QueryWrapper<>();
+        wrapper.eq("local_person", personId);
+
+        List<TaFaceLib> taFaceLibs = taFaceLibMapper.selectList(wrapper);
+        if (null == taFaceLibs || taFaceLibs.size() == 0) {
+            return true;
+        }
+
+        for (TaFaceLib taFaceLib: taFaceLibs) {
+            String libCode = taFaceLib.getLibCode();
+
+            if (libCode.indexOf(ALI_FACE_LIB) > -1) {
+                // 删除阿里人脸
+                try {
+                    aliFaceUtils.deleteFace(taFaceLib.getLibPerson(), taFaceLib.getLibFace());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                // 删除海康人脸
+                try {
+                    Map<String, Object> payload = new HashMap<>();
+                    payload.put("personId", personId);
+                    Action act = Action.create(Action.TYPE_DELETE_FACE, payload);
+                    WebSocketServer.sendInfo(act.toJSON(), "device", taFaceLib.getDeviceId());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            // 清除数据库
+            taFaceLibMapper.deleteById(taFaceLib);
+        }
+
+        return false;
+    }
+
     @Override
     public boolean newPersonByDevice(TaSnapshotPerson taSnapshotPerson) {
         boolean workingTime = iSysParamService.isInWorkingTime(LocalDateTime.now());

src/main/java/com.huiju.welcome/utils/AliFaceUtils.java

@@ -10,6 +10,7 @@ import com.aliyuncs.IAcsClient;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.exceptions.ServerException;
 import com.aliyuncs.green.model.v20180509.AddFacesRequest;
+import com.aliyuncs.green.model.v20180509.DeleteFacesRequest;
 import com.aliyuncs.green.model.v20180509.AddPersonRequest;
 import com.aliyuncs.green.model.v20180509.GetPersonRequest;
 import com.aliyuncs.green.model.v20180509.ImageSyncScanRequest;
@@ -273,6 +274,7 @@ public class AliFaceUtils {
                 if (200 == scrResponse.getInteger("code")) {
                     JSONObject resultObject = scrResponse.getJSONObject("data");
                     if (200 == resultObject.getInteger("code")) {
+                        result = resultObject;
                         System.out.println(resultObject.getString("personId"));
                     } else {
                         System.out.println("task process fail:" + resultObject.getInteger("code"));
@@ -293,6 +295,42 @@ public class AliFaceUtils {
         return result;
     }
 
+    public void deleteFace(String personId, String faceId) throws Exception {
+
+        DeleteFacesRequest deleteFacesRequest = new DeleteFacesRequest();
+        deleteFacesRequest.setAcceptFormat(FormatType.JSON); // 指定api返回格式
+        deleteFacesRequest.setMethod(com.aliyuncs.http.MethodType.POST); // 指定请求方法
+        deleteFacesRequest.setEncoding("utf-8");
+
+        JSONObject data = new JSONObject();
+        data.put("personId", personId);
+        data.put("faceIds", new ArrayList<String>(){{
+            add(faceId);
+        }});
+
+        deleteFacesRequest.setHttpContent(data.toJSONString().getBytes("UTF-8"), "UTF-8", FormatType.JSON);
+        deleteFacesRequest.setConnectTimeout(3000);
+        deleteFacesRequest.setReadTimeout(6000);
+
+        try {
+            HttpResponse httpResponse = recognitionClient.doAction(deleteFacesRequest);
+
+            if (httpResponse.isSuccess()) {
+                return;
+            } else {
+                log.error("删除人脸失败: {}", httpResponse.getHttpContentString());
+            }
+        } catch (ServerException e) {
+            e.printStackTrace();
+        } catch (ClientException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return;
+    }
+
     /**
      * 人脸查询
      * @param url

src/main/resources/application.yml

@@ -1,12 +1,12 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-    username: welcome
-    password: s190QU2#z%hdU%^FPkY9qjls
-#    url: jdbc:mysql://47.101.36.130:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-#    username: root
-#    password: Wt4q*/9}i00q@0a4jM{z6O#h129@F/
+#    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+#    username: welcome
+#    password: s190QU2#z%hdU%^FPkY9qjls
+    url: jdbc:mysql://47.101.36.130:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+    username: root
+    password: Wt4q*/9}i00q@0a4jM{z6O#h129@F/
   servlet:
     multipart:
       max-file-size: 1024MB