提交 5d66b522 作者: Administrator

Merge branch 'merge_dev' of https://gitlab.yiring.com/chemical-kesai/kshg-api into dev_tzl

...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
package com.yiring.app.domain.location; package com.yiring.app.domain.location;
import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
import com.yiring.auth.domain.user.User;
import com.yiring.common.domain.BasicEntity; import com.yiring.common.domain.BasicEntity;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
...@@ -52,6 +53,10 @@ public class LocationTurnover extends BasicEntity implements Serializable { ...@@ -52,6 +53,10 @@ public class LocationTurnover extends BasicEntity implements Serializable {
@Comment("定位时间") @Comment("定位时间")
LocalDateTime time; LocalDateTime time;
@Comment("用户")
@ManyToOne(fetch = FetchType.LAZY)
User user;
@Comment("进入") @Comment("进入")
Boolean enter; Boolean enter;
......
...@@ -218,6 +218,7 @@ public class PositionMessageServiceImpl implements PositionMessageService { ...@@ -218,6 +218,7 @@ public class PositionMessageServiceImpl implements PositionMessageService {
.sourceId(fence.getId()) .sourceId(fence.getId())
.tag(id.getTag()) .tag(id.getTag())
.time(id.getTime()) .time(id.getTime())
.user(id.getTag().getUser())
.isLatest(true) .isLatest(true)
.build(); .build();
turnovers.add(turnover); turnovers.add(turnover);
...@@ -267,6 +268,7 @@ public class PositionMessageServiceImpl implements PositionMessageService { ...@@ -267,6 +268,7 @@ public class PositionMessageServiceImpl implements PositionMessageService {
.sourceId(district.getId()) .sourceId(district.getId())
.tag(id.getTag()) .tag(id.getTag())
.time(id.getTime()) .time(id.getTime())
.user(id.getTag().getUser())
.isLatest(true) .isLatest(true)
.build(); .build();
turnovers.add(turnover); turnovers.add(turnover);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论