diff --git a/ebike-gather/src/main/java/org/cdzy/gather/kafka/KafkaConsumer.java b/ebike-gather/src/main/java/org/cdzy/gather/kafka/KafkaConsumer.java index f9e3d0e..5fb2da5 100644 --- a/ebike-gather/src/main/java/org/cdzy/gather/kafka/KafkaConsumer.java +++ b/ebike-gather/src/main/java/org/cdzy/gather/kafka/KafkaConsumer.java @@ -3,7 +3,6 @@ package org.cdzy.gather.kafka; import com.cdzy.common.model.CMDMsg; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; import io.netty.handler.codec.mqtt.MqttQoS; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.cdzy.gather.mqtt.MqttPoolClient; diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSite.java b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSite.java index 07b1a6a..65b2d17 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSite.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSite.java @@ -1,5 +1,10 @@ package com.cdzy.operations.model.entity; +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 com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; @@ -53,6 +58,9 @@ public class EbikeSite implements Serializable { /** * 站点区域 */ + @Column(typeHandler = PGpolygonTypeHandler.class) + @JsonSerialize(using = PGpolygonSerializer.class) + @JsonDeserialize(using = PGpolygonDeserializer.class) private PGpolygon sitePolygon; /** diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeSiteServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeSiteServiceImpl.java index 30c5226..10bbb80 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeSiteServiceImpl.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeSiteServiceImpl.java @@ -20,7 +20,7 @@ public class EbikeSiteServiceImpl extends ServiceImpl