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 e24389f..dc688a9 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 @@ -7,6 +7,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -53,7 +54,8 @@ public class Fence { /** * 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat (pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createdTime; /** * 更新人 @@ -62,6 +64,7 @@ public class Fence { /** * 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat (pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updatedTime; } diff --git a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/HistoryRecord.java b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/HistoryRecord.java index c7ead7a..1a9df05 100644 --- a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/HistoryRecord.java +++ b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/HistoryRecord.java @@ -2,10 +2,12 @@ package com.dragon.vehicle.history.common.domain; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -31,10 +33,14 @@ public class HistoryRecord { /** * 车辆开始行驶时间 */ + @JsonFormat (pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** * 车辆结束行驶时间 */ + @JsonFormat (pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; /** * 是否删除记录 1-是 0-否 diff --git a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/VehicleData.java b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/VehicleData.java index e893c75..b50931e 100644 --- a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/VehicleData.java +++ b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/VehicleData.java @@ -4,7 +4,9 @@ package com.dragon.vehicle.history.common.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.*; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; @@ -31,6 +33,8 @@ public class VehicleData { /** * 时间戳 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** diff --git a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/req/HistoryReq.java b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/req/HistoryReq.java index 3a3c607..a94ecf0 100644 --- a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/req/HistoryReq.java +++ b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/req/HistoryReq.java @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -25,11 +26,13 @@ public class HistoryReq { /** * 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat (pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** * 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat (pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; } diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/HistoricalTrackController.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/HistoricalTrackController.java index dca5890..45a7a05 100644 --- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/HistoricalTrackController.java +++ b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/HistoricalTrackController.java @@ -51,7 +51,7 @@ public class HistoricalTrackController { */ @PostMapping("/CarRecord") @DS(value = "slave1") - public Result> CarRecord(@RequestBody HistoryReq historyReq){ - return Result.success(historicalTrackService.CarRecord(historyReq)); + public Result> carRecord(@RequestBody HistoryReq historyReq){ + return Result.success(historicalTrackService.carRecord(historyReq)); } } diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/HistoricalTrackService.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/HistoricalTrackService.java index 3ce0062..576faaa 100644 --- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/HistoricalTrackService.java +++ b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/HistoricalTrackService.java @@ -30,5 +30,5 @@ public interface HistoricalTrackService { * @param historyReq * @return */ - List CarRecord(HistoryReq historyReq); + List carRecord(HistoryReq historyReq); } diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/HistoricalTrackServiceImpl.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/HistoricalTrackServiceImpl.java index 52fe2f2..730e577 100644 --- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/HistoricalTrackServiceImpl.java +++ b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/HistoricalTrackServiceImpl.java @@ -56,7 +56,7 @@ public class HistoricalTrackServiceImpl implements HistoricalTrackService { * @return */ @Override - public List CarRecord(HistoryReq historyReq) { + public List carRecord(HistoryReq historyReq) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper wrapper = queryWrapper .eq(VehicleData::getVin, historyReq.getVin())