1

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

@@ -18,7 +18,7 @@ public interface CameraEntityMapper {
 
     int addEntity(CameraEntity entity);
 
-    CameraEntity getOne(int entityId);
+    CameraEntity getOne(int id);
 
     int updateEntity(CameraEntity entity);
 }

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

+package cn.lefull.repository.mapper.face;
+
+import cn.lefull.repository.model.face.CameraLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author 杨奇
+ */
+@Mapper
+public interface CameraLogMapper {
+
+    int addLog(CameraLog log);
+}

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

+package cn.lefull.repository.model.face;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author admin
+ */
+@Data
+public class CameraLog {
+
+    /**
+     * 主键
+     */
+    private Integer cameraLogId;
+
+    /**
+     * 门店id
+     */
+    private Integer apartmentId;
+
+    /**
+     * 样本id
+     */
+    private Integer cameraEntityId;
+
+    /**
+     * 身份 1其它 2内部员工 3外卖员 4快递员 5在住租客 6访客 7保洁人员 8维修人员
+     */
+    private Byte identity;
+
+    /**
+     * 操作人
+     */
+    private Integer operatorEmployeeId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 是否删除
+     */
+    private Byte isDelete;
+
+    /**
+     * 删除时间
+     */
+    private LocalDateTime deleteTime;
+}

lefull-lot-repository/src/main/resources/mapper/face/CameraLogMapper.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.CameraLogMapper">
+
+    <insert id="addLog" keyProperty="cameraLogId" useGeneratedKeys="true" parameterType="cn.lefull.repository.model.face.CameraLog">
+        INSERT INTO camera_log (camera_log_id, apartment_id, camera_entity_id, identity)
+        VALUES(#{cameraLogId}, #{apartmentId}, #{cameraEntityId}, #{identity});
+    </insert>
+</mapper>

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

@@ -35,6 +35,8 @@ public class EquipmentServiceImpl implements EquipmentService {
     @Autowired
     private AliFaceLogMapper logMapper;
     @Autowired
+    private CameraLogMapper cameraLogMapper;
+    @Autowired
     private FaceService faceService;
 
     @Override
@@ -79,9 +81,15 @@ public class EquipmentServiceImpl implements EquipmentService {
         return "apartment_" + apartmentId;
     }
 
-    private String getEntityId(int entityId)
+    private String getEntityId(int cameraEntityId)
+    {
+        return "entity_" + cameraEntityId;
+    }
+
+    private int getCameraEntityId(String entityId)
     {
-        return "entity_" + entityId;
+        String str = entityId.replace("entity_", "");
+        return Integer.parseInt(str);
     }
 
     private int getFaceDbId(int apartmentId) throws Exception {
@@ -263,6 +271,7 @@ public class EquipmentServiceImpl implements EquipmentService {
         String dbName = this.getFaceDbName(apartmentId);
         int dbId = this.getFaceDbId(apartmentId);
 
+        int cameraEntityId;
         String entityId;
         String faceId;
         String ossUrl;
@@ -281,8 +290,8 @@ public class EquipmentServiceImpl implements EquipmentService {
             entity.setOperatorEmployeeId(0);
 
             entityMapper.addEntity(entity);
-            int id = entity.getCameraEntityId();
-            entityId = this.getEntityId(id);
+            cameraEntityId = entity.getCameraEntityId();
+            entityId = this.getEntityId(cameraEntityId);
             faceService.addFace(dbName, entityId, "");
             AliFaceImage image = faceService.addFaceImage(dbName, entityId, url);
             faceId = image.getFaceId();
@@ -291,6 +300,7 @@ public class EquipmentServiceImpl implements EquipmentService {
             entityId = map.get("entityId");
             faceId = map.get("faceId");
             ossUrl = map.get("ossUrl");
+            cameraEntityId = this.getCameraEntityId(entityId);
         }
 
         AliFaceLog log = new AliFaceLog();
@@ -300,6 +310,16 @@ public class EquipmentServiceImpl implements EquipmentService {
         log.setImageUrl(url);
         log.setOssUrl(ossUrl);
         logMapper.addLog(log);
+
+        CameraEntity entity = entityMapper.getOne(cameraEntityId);
+        if(entity == null){
+            throw new Exception("参数错误");
+        }
+        CameraLog cameraLog = new CameraLog();
+        cameraLog.setApartmentId(apartmentId);
+        cameraLog.setCameraEntityId(cameraEntityId);
+        cameraLog.setIdentity(entity.getIdentity());
+        cameraLogMapper.addLog(cameraLog);
         return true;
     }
 }