diff --git a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/Car.java b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/Car.java index 8589f9c..0bad128 100644 --- a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/Car.java +++ b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/Car.java @@ -1,6 +1,8 @@ package com.dragon.vehicle.history.common.domain; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -15,10 +17,12 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "car") public class Car { /** * 车辆表ID */ + @TableId(value = "car_id") private Integer carId; /** * 车辆VIN diff --git a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/CarType.java b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/CarType.java index 4644e20..8bb2aea 100644 --- a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/CarType.java +++ b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/CarType.java @@ -1,5 +1,7 @@ package com.dragon.vehicle.history.common.domain; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,10 +16,12 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor +@TableName(value = "car_type") public class CarType { /** * 车辆类型表ID */ + @TableId(value = "car_type_id") private Integer carTypeId; /** * 车辆类型名称 diff --git a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/Fence.java b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/Fence.java index cc7d763..74f8458 100644 --- a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/Fence.java +++ b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/Fence.java @@ -1,5 +1,7 @@ package com.dragon.vehicle.history.common.domain; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -16,10 +18,12 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "fence") public class Fence { /** * 围栏主键id */ + @TableId(value = "fence_id") private Integer fenceId; /** * 围栏名称 diff --git a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/VehicleOperation.java b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/VehicleOperation.java index cec8445..5073a69 100644 --- a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/VehicleOperation.java +++ b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/VehicleOperation.java @@ -1,5 +1,7 @@ package com.dragon.vehicle.history.common.domain; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; @@ -18,10 +20,12 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "vehicle_operation") public class VehicleOperation { /** * 车辆实时轨迹数据表 */ + @TableId(value = "vehicle_operation_id") private Integer vehicleOperationId; /** * 车辆VIN diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java index f102256..62df915 100644 --- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java +++ b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java @@ -1,6 +1,5 @@ package com.dragon.vehicle.history.server.service.impl; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dragon.common.core.domain.Result; import com.dragon.vehicle.history.common.domain.Car;