1

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

@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface AliFaceDbMapper {
 
-    AliFaceDb getDbByName(AliFaceDb face);
+    AliFaceDb getDbByName(String dbName);
 
     int addDb(AliFaceDb face);
 }

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

@@ -45,10 +45,10 @@ public class FaceServiceImpl implements FaceService{
     @Override
     public void createFaceDb(String dbName) throws Exception {
         Utils.checkParamsNotEmpty(dbName, "dbName");
-        AliFaceDb face = new AliFaceDb();
-        face.setDbName(dbName);
-        AliFaceDb db = dbMapper.getDbByName(face);
+        AliFaceDb db = dbMapper.getDbByName(dbName);
         if(db == null){
+            AliFaceDb face = new AliFaceDb();
+            face.setDbName(dbName);
             dbMapper.addDb(face);
         }
         sdk.createFaceDb(dbName);
@@ -71,9 +71,7 @@ public class FaceServiceImpl implements FaceService{
     }
 
     private void updateFaceHandle(String dbName, String entityId, String labels) throws Exception{
-        AliFaceDb face = new AliFaceDb();
-        face.setDbName(dbName);
-        AliFaceDb db = dbMapper.getDbByName(face);
+        AliFaceDb db = dbMapper.getDbByName(dbName);
         if(db == null){
             throw new Exception("未找到人脸数据库:" + dbName);
         }
@@ -103,9 +101,7 @@ public class FaceServiceImpl implements FaceService{
         Utils.checkParamsNotEmpty(entityId, "entityId");
         Utils.checkParamsNotEmpty(url, "url");
 
-        AliFaceDb faceDb = new AliFaceDb();
-        faceDb.setDbName(dbName);
-        AliFaceDb db = dbMapper.getDbByName(faceDb);
+        AliFaceDb db = dbMapper.getDbByName(dbName);
         if(db == null){
             throw new Exception("未找到人脸数据库:" + dbName);
         }
@@ -130,9 +126,7 @@ public class FaceServiceImpl implements FaceService{
     public boolean searchFace(String dbName, String url) throws Exception {
         Utils.checkParamsNotEmpty(dbName, "dbName");
         Utils.checkParamsNotEmpty(url, "url");
-        AliFaceDb faceDb = new AliFaceDb();
-        faceDb.setDbName(dbName);
-        AliFaceDb db = dbMapper.getDbByName(faceDb);
+        AliFaceDb db = dbMapper.getDbByName(dbName);
         if(db == null){
             return false;
         }

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

@@ -63,11 +63,20 @@ public class EquipmentServiceImpl implements EquipmentService {
         CameraApartmentDb camera = apartmentDbMapper.getDb(apartmentId);
         if(camera == null){
             String dbName = "apartment_" + apartmentId;
-            //AliFaceDb face = aliFaceDbMapper.getDbByName(dbName);
-
+            AliFaceDb face = aliFaceDbMapper.getDbByName(dbName);
+            int faceId;
+            if(face == null){
+                AliFaceDb faceDb = new AliFaceDb();
+                faceDb.setDbName(dbName);
+                faceId = aliFaceDbMapper.addDb(faceDb);
+            }else{
+                faceId = face.getAliFaceDbId();
+            }
             CameraApartmentDb db = new CameraApartmentDb();
             db.setApartmentId(apartmentId);
-            return 0;
+            db.setAliFaceDbId(faceId);
+            apartmentDbMapper.addDb(db);
+            return faceId;
         }
         return camera.getAliFaceDbId();
     }