diff --git a/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserBikeInfo.java b/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserBikeInfo.java index 1f527e6..c28172d 100644 --- a/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserBikeInfo.java +++ b/ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserBikeInfo.java @@ -4,6 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.Polygon; import java.io.Serial; @@ -11,7 +12,7 @@ import java.io.Serializable; import java.math.BigDecimal; /** - * 实体类。 + * 实体类。 * * @author attiya * @since 2025-10-21 @@ -103,4 +104,9 @@ public class FeignEbikeUserBikeInfo implements Serializable { */ private Polygon regionPolygon; + /** + * 车辆当前位置 + */ + private Point location; + } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserBikeInfo.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserBikeInfo.java index 54e2ca5..888be83 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserBikeInfo.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserBikeInfo.java @@ -1,5 +1,8 @@ package com.cdzy.operations.model.dto; +import com.cdzy.operations.handler.PointDeserializer; +import com.cdzy.operations.handler.PointSerializer; +import com.cdzy.operations.handler.PointTypeHandler; import com.cdzy.operations.handler.PolygonDeserializer; import com.cdzy.operations.handler.PolygonSerializer; import com.cdzy.operations.handler.PolygonTypeHandler; @@ -10,6 +13,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.Polygon; import java.io.Serial; @@ -17,7 +21,7 @@ import java.io.Serializable; import java.math.BigDecimal; /** - * 实体类。 + * 实体类。 * * @author attiya * @since 2025-10-21 @@ -112,5 +116,11 @@ public class EbikeUserBikeInfo implements Serializable { @JsonDeserialize(using = PolygonDeserializer.class) private Polygon regionPolygon; - + /** + * 当前位置 + */ + @Column(typeHandler = PointTypeHandler.class) + @JsonSerialize(using = PointSerializer.class) + @JsonDeserialize(using = PointDeserializer.class) + private Point location; } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java index eff0fb6..f1b445b 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java @@ -450,6 +450,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl