1

lefull-lot-service/src/main/java/cn/lefull/service/ali/FaceService.java

 package cn.lefull.service.ali;
 
+import cn.lefull.repository.model.face.AliFaceImage;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -39,7 +40,7 @@ public interface FaceService {
     /**
      * 添加人脸数据
      */
-    void addFaceImage(String dbName, String entityId, String url) throws Exception;
+    AliFaceImage addFaceImage(String dbName, String entityId, String url) throws Exception;
 
     void addFaceImageList(String dbName, String entityId, String[] urlList) throws Exception;
 

lefull-lot-service/src/main/java/cn/lefull/service/ali/FaceServiceImpl.java

@@ -90,7 +90,7 @@ public class FaceServiceImpl implements FaceService{
     }
 
     @Override
-    public void addFaceImage(String dbName, String entityId, String url) throws Exception {
+    public AliFaceImage addFaceImage(String dbName, String entityId, String url) throws Exception {
         Utils.checkParamsNotEmpty(dbName, "dbName");
         Utils.checkParamsNotEmpty(entityId, "entityId");
         Utils.checkParamsNotEmpty(url, "url");
@@ -113,7 +113,9 @@ public class FaceServiceImpl implements FaceService{
         image.setFaceId(faceId);
         image.setImageUrl(url);
         image.setOssUrl(ossUrl);
-        imageMapper.addImage(image);
+        int id = imageMapper.addImage(image);
+        image.setAliFaceImageId(id);
+        return image;
     }
 
     @Override

lefull-lot-service/src/main/java/cn/lefull/service/lisa/EquipmentServiceImpl.java

@@ -260,6 +260,9 @@ public class EquipmentServiceImpl implements EquipmentService {
         String dbName = this.getFaceDbName(apartmentId);
         int dbId = this.getFaceDbId(apartmentId);
 
+        String entityId;
+        String faceId;
+        String ossUrl;
         Map<String, String> map = faceService.searchFace(dbName, url);
         if(map == null){
             //校验失败
@@ -267,14 +270,16 @@ public class EquipmentServiceImpl implements EquipmentService {
             entity.setApartmentId(apartmentId);
             entity.setImgUrl(url);
             int id = entityMapper.addEntity(entity);
-            String entityId = this.getEntityId(id);
+            entityId = this.getEntityId(id);
             faceService.addFace(dbName, entityId, "");
-            faceService.addFaceImage(dbName, entityId, url);
-            return false;
+            AliFaceImage image = faceService.addFaceImage(dbName, entityId, url);
+            faceId = image.getFaceId();
+            ossUrl = image.getOssUrl();
+        }else{
+            entityId = map.get("entityId");
+            faceId = map.get("faceId");
+            ossUrl = map.get("ossUrl");
         }
-        String entityId = map.get("entityId");
-        String faceId = map.get("faceId");
-        String ossUrl = map.get("ossUrl");
 
         AliFaceLog log = new AliFaceLog();
         log.setAliFaceDbId(dbId);