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 70feb0d..80d749b 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 @@ -1,10 +1,10 @@ package com.ebike.feign.model.dto; -import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.postgresql.geometric.PGpolygon; import java.io.Serial; import java.io.Serializable; @@ -20,7 +20,6 @@ import java.math.BigDecimal; @Builder @NoArgsConstructor @AllArgsConstructor -@Table("ebike_bike_info") public class FeignEbikeUserBikeInfo implements Serializable { @Serial @@ -99,5 +98,9 @@ public class FeignEbikeUserBikeInfo implements Serializable { */ private BigDecimal helmetManagementFee; + /** + * 车辆运营区 + */ + private PGpolygon regionPolygon; } 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 8a5173d..7d8f7e5 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,9 +1,16 @@ package com.cdzy.operations.model.dto; +import com.cdzy.operations.handler.PGpolygonDeserializer; +import com.cdzy.operations.handler.PGpolygonSerializer; +import com.cdzy.operations.handler.PGpolygonTypeHandler; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.mybatisflex.annotation.Column; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.postgresql.geometric.PGpolygon; import java.io.Serial; import java.io.Serializable; @@ -97,5 +104,13 @@ public class EbikeUserBikeInfo implements Serializable { */ private BigDecimal helmetManagementFee; + /** + * 运营区域 + */ + @Column(typeHandler = PGpolygonTypeHandler.class) + @JsonSerialize(using = PGpolygonSerializer.class) + @JsonDeserialize(using = PGpolygonDeserializer.class) + private PGpolygon regionPolygon; + } 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 9dd9a01..7219bfa 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 @@ -97,6 +97,9 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl