1

lefull-lot-api-web/src/main/java/cn/lefull/api/FaceController.java

@@ -58,8 +58,8 @@ public class FaceController {
     @NoAuth
     @GetMapping("/addFaceImage")
     public ApiResponse<Object> addFaceImage(String dbName, String entityId, String url) throws Exception {
-        String faceId = faceService.addFaceImage(dbName, entityId, url);
-        return new ApiResponse<>(faceId);
+        faceService.addFaceImage(dbName, entityId, url);
+        return new ApiResponse<>();
     }
 
     @NoAuth

lefull-lot-repository/src/main/java/cn/lefull/repository/mapper/face/AliFaceImageMapper.java

+package cn.lefull.repository.mapper.face;
+
+import cn.lefull.repository.model.face.AliFaceEntity;
+import cn.lefull.repository.model.face.AliFaceImage;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author 杨奇
+ */
+@Mapper
+public interface AliFaceImageMapper {
+
+    int addImage(AliFaceImage image);
+}

lefull-lot-repository/src/main/java/cn/lefull/repository/model/face/AliFaceImage.java

+package cn.lefull.repository.model.face;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author 杨奇
+ */
+@Data
+public class AliFaceImage {
+
+    private Integer aliFaceImageId;
+
+    private Integer aliFaceEntityId;
+
+    private String faceId;
+
+    private String imageUrl;
+
+    private String ossUrl;
+
+    private Integer operatorEmployeeId;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+
+    private Byte isDelete;
+
+    private LocalDateTime deleteTime;
+}

lefull-lot-repository/src/main/resources/mapper/face/AliFaceImageMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.lefull.repository.mapper.face.AliFaceImageMapper">
+
+    <insert id="addImage" keyProperty="aliFaceImageId" useGeneratedKeys="true" parameterType="cn.lefull.repository.model.face.AliFaceImage">
+        INSERT INTO ali_face_image (ali_face_entity_id, face_id, image_url, oss_url)
+        VALUES(#{aliFaceEntityId}, #{faceId}, #{imageUrl}, #{ossUrl});
+    </insert>
+</mapper>

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

@@ -39,7 +39,7 @@ public interface FaceService {
     /**
      * 添加人脸数据
      */
-    public String addFaceImage(String dbName, String entityId, String url) throws Exception;
+    public void addFaceImage(String dbName, String entityId, String url) throws Exception;
 
     /**
      * 搜索人脸

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

@@ -4,9 +4,11 @@ import cn.lefull.common.sdk.ali.base.Face;
 import cn.lefull.common.utils.Utils;
 import cn.lefull.repository.mapper.face.AliFaceDbMapper;
 import cn.lefull.repository.mapper.face.AliFaceEntityMapper;
+import cn.lefull.repository.mapper.face.AliFaceImageMapper;
 import cn.lefull.repository.mapper.test.TestMapper;
 import cn.lefull.repository.model.face.AliFaceDb;
 import cn.lefull.repository.model.face.AliFaceEntity;
+import cn.lefull.repository.model.face.AliFaceImage;
 import com.aliyun.facebody20191230.models.SearchFaceResponseBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +27,8 @@ public class FaceServiceImpl implements FaceService{
     private AliFaceDbMapper dbMapper;
     @Autowired
     private AliFaceEntityMapper entityMapper;
+    @Autowired
+    private AliFaceImageMapper imageMapper;
 
     @Override
     public List<String> getFaceDbList() throws Exception {
@@ -87,12 +91,32 @@ public class FaceServiceImpl implements FaceService{
     }
 
     @Override
-    public String addFaceImage(String dbName, String entityId, String url) throws Exception {
+    public void addFaceImage(String dbName, String entityId, String url) throws Exception {
         Utils.checkParamsNotEmpty(dbName, "dbName");
         Utils.checkParamsNotEmpty(entityId, "entityId");
         Utils.checkParamsNotEmpty(url, "url");
-        url = sdk.uploadImageUrl(url);
-        return sdk.addFaceImage(dbName, entityId, url);
+
+        AliFaceDb faceDb = new AliFaceDb();
+        faceDb.setDbName(dbName);
+        AliFaceDb db = dbMapper.getDbByName(faceDb);
+        if(db == null){
+            throw new Exception("未找到人脸数据库:" + dbName);
+        }
+        AliFaceEntity entityDb = new AliFaceEntity();
+        entityDb.setAliFaceDbId(db.getAliFaceDbId());
+        entityDb.setEntityId(entityId);
+        AliFaceEntity entity = entityMapper.getEntityByEntityId(entityDb);
+        if(entity == null){
+            throw new Exception("没找到样本:" + entityId);
+        }
+        String ossUrl = sdk.uploadImageUrl(url);
+        String faceId = sdk.addFaceImage(dbName, entityId, ossUrl);
+        AliFaceImage image = new AliFaceImage();
+        image.setAliFaceEntityId(entity.getAliFaceEntityId());
+        image.setFaceId(faceId);
+        image.setImageUrl(url);
+        image.setOssUrl(ossUrl);
+        imageMapper.addImage(image);
     }
 
     @Override