diff --git a/src/main/java/com/campus/water/entity/WaterTerminalLocation.java b/src/main/java/com/campus/water/entity/WaterTerminalLocation.java index ebd5f23..f92ce7d 100644 --- a/src/main/java/com/campus/water/entity/WaterTerminalLocation.java +++ b/src/main/java/com/campus/water/entity/WaterTerminalLocation.java @@ -1,5 +1,5 @@ package com.campus.water.entity; - +import java.math.BigDecimal; import lombok.Data; import jakarta.persistence.*; @@ -25,16 +25,16 @@ public class WaterTerminalLocation { private String terminalName; /** - * 经度(高德GCJ-02坐标系,地图定位核心字段) + * 经度(高德GCJ-02坐标系,改用DECIMAL类型支持精度配置) */ - @Column(name = "longitude", nullable = false, precision = 10, scale = 6) - private Double longitude; + @Column(name = "longitude", nullable = false, columnDefinition = "DECIMAL(10,6)") + private BigDecimal longitude; /** - * 纬度(高德GCJ-02坐标系,地图定位核心字段) + * 纬度(高德GCJ-02坐标系,改用DECIMAL类型支持精度配置) */ - @Column(name = "latitude", nullable = false, precision = 10, scale = 6) - private Double latitude; + @Column(name = "latitude", nullable = false, columnDefinition = "DECIMAL(10,6)") + private BigDecimal latitude; /** * 是否可用(关联device表的status字段:online→true,offline/fault→false) diff --git a/src/main/java/com/campus/water/entity/vo/TerminalLocationVO.java b/src/main/java/com/campus/water/entity/vo/TerminalLocationVO.java index 8492273..a40dfd6 100644 --- a/src/main/java/com/campus/water/entity/vo/TerminalLocationVO.java +++ b/src/main/java/com/campus/water/entity/vo/TerminalLocationVO.java @@ -1,30 +1,15 @@ package com.campus.water.entity.vo; import lombok.Data; +import java.math.BigDecimal; -/** - * 终端机位置VO(整合坐标表+设备表数据,前端地图展示专用) - */ @Data public class TerminalLocationVO { - /** 终端机ID */ private String terminalId; - - /** 终端机名称 */ private String terminalName; - - /** 经度 */ - private Double longitude; - - /** 纬度 */ - private Double latitude; - - /** 是否可用 */ + private BigDecimal longitude; // 同步改为BigDecimal + private BigDecimal latitude; // 同步改为BigDecimal private Boolean isAvailable; - - /** 安装位置(复用device表的install_location) */ private String installLocation; - - /** 设备状态(online/offline/fault) */ private String deviceStatus; } \ No newline at end of file