feat: 补充定位日志、围栏表字段

app/src/main/java/com/yiring/app/domain/location/LocationFence.java

@@ -4,6 +4,8 @@ package com.yiring.app.domain.location;
 import com.yiring.common.annotation.FieldMapping;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.HashSet;
+import java.util.Set;
 import javax.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
@@ -78,6 +80,12 @@ public class LocationFence implements Serializable {
     @Comment("消抖时间（秒）")
     Integer threshold;
 
+    @Comment("信标集合")
+    @Builder.Default
+    @ManyToMany
+    @ToString.Exclude
+    Set<LocationBeacon> beacons = new HashSet<>(0);
+
     @Comment("创建时间")
     LocalDateTime createTime;
 

app/src/main/java/com/yiring/app/domain/location/LocationLog.java

@@ -3,6 +3,7 @@ package com.yiring.app.domain.location;
 
 import com.alibaba.fastjson.JSONObject;
 import com.yiring.app.config.converter.JSONObjectConverter;
+import com.yiring.auth.domain.user.User;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -49,8 +50,23 @@ public class LocationLog implements Serializable {
     @GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.LONG)
     Long id;
 
+    /**
+     * 来源于定位数据产生时刻标签所属的人员
+     */
+    @Comment("用户")
+    @ManyToOne
+    @JoinColumn(name = "user_id")
+    User user;
+
+    /**
+     * 来源于定位标签定位时刻的人员状态
+     */
+    @Comment("用户状态")
+    String status;
+
     @Comment("标签")
     @ManyToOne
+    @JoinColumn(name = "tag_id")
     LocationTag tag;
 
     @Comment("时间")