From dc61620464af1c75069d21c8e4a934a2766ad72f Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 21 Jul 2026 11:34:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=BB=8F=E7=BA=AC?= =?UTF-8?q?=E5=BA=A6=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yfd/platform/qgc_base/domain/SdAddvcdDic.java | 5 +++-- .../java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java | 5 +++-- .../java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java | 5 +++-- .../com/yfd/platform/qgc_base/domain/vo/EngRsvrcscdBVo.java | 5 +++-- .../yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java | 5 +++-- .../yfd/platform/qgc_data/domain/vo/FishDraftDataVO.java | 4 ++-- .../platform/qgc_eng/eq/entity/vo/EngEqBaseMsstbprptVo.java | 5 +++-- .../com/yfd/platform/qgc_env/fh/entity/vo/FhBaseInfoVo.java | 4 ++-- .../yfd/platform/qgc_env/fpr/entity/vo/FprMsstbprptVo.java | 5 +++-- .../yfd/platform/qgc_env/fpr/entity/vo/FprdPointInfoVo.java | 6 ++++-- .../qgc_env/fpr/service/impl/FprMonitorServiceImpl.java | 4 ++-- .../qgc_env/overview/entity/vo/OverviewMsstbprptVo.java | 5 +++-- .../platform/qgc_env/vap/entity/vo/FhvapBuiltPointVo.java | 6 ++++-- .../yfd/platform/qgc_env/vap/entity/vo/VpVmsstbprptVo.java | 4 ++-- .../com/yfd/platform/qgc_env/vap/entity/vo/WvaPointVo.java | 6 ++++-- .../com/yfd/platform/qgc_env/wq/entity/vo/WqBaseInfoVo.java | 5 +++-- .../yfd/platform/qgc_env/wt/entity/vo/SdWtBaseInfoVO.java | 5 +++-- .../com/yfd/platform/qgc_env/wt/entity/vo/WtBaseInfoVo.java | 4 ++-- .../com/yfd/platform/qgc_env/zq/entity/vo/ZqBaseInfoVo.java | 5 +++-- .../qgc_sys/obliqueImage/domain/MsObliqueImageB.java | 5 +++-- 20 files changed, 58 insertions(+), 40 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAddvcdDic.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAddvcdDic.java index 69223c3e..813addef 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAddvcdDic.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAddvcdDic.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.math.BigDecimal; /** *

@@ -54,12 +55,12 @@ public class SdAddvcdDic implements Serializable { /** * 中心经度 */ - private Double lgtd; + private BigDecimal lgtd; /** * 中心纬度 */ - private Double lttd; + private BigDecimal lttd; /** * 面积 diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java index a34a36ae..464ddc2f 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -48,12 +49,12 @@ public class SdEngInfoBH implements Serializable { /** * 位置经度。单位:(°) */ - private Double lgtd; + private BigDecimal lgtd; /** * 位置纬度。单位:(°) */ - private Double lttd; + private BigDecimal lttd; /** * 高程。单位:m diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java index 53178c88..4ceb5cb2 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -54,12 +55,12 @@ public class SdRvcdDic implements Serializable { /** * 经度 */ - private Double lgtd; + private BigDecimal lgtd; /** * 纬度 */ - private Double lttd; + private BigDecimal lttd; /** * 面积 diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngRsvrcscdBVo.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngRsvrcscdBVo.java index 4ccc4736..ca7f29c1 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngRsvrcscdBVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngRsvrcscdBVo.java @@ -2,6 +2,7 @@ package com.yfd.platform.qgc_base.domain.vo; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; @Data @@ -35,9 +36,9 @@ public class EngRsvrcscdBVo { private Integer isDeleted; - private Double lgtd; + private BigDecimal lgtd; - private Double lttd; + private BigDecimal lttd; private String stlc; } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java index 28c657ee..0554dae5 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @Data @@ -32,8 +33,8 @@ public class EngVmsstbprptVo implements Serializable { private String hycd; private String topHycd; private String stlc; - private Double lgtd; - private Double lttd; + private BigDecimal lgtd; + private BigDecimal lttd; private Date jcdt; private Date piodt; private Date aiodt; diff --git a/backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/FishDraftDataVO.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/FishDraftDataVO.java index b87da039..69a378d2 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/FishDraftDataVO.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/FishDraftDataVO.java @@ -210,12 +210,12 @@ public class FishDraftDataVO implements Serializable { /** * 电站经度(电站表) */ - private Double lgtd; + private BigDecimal lgtd; /** * 电站纬度(电站表) */ - private Double lttd; + private BigDecimal lttd; /** * 排序字段 diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqBaseMsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqBaseMsstbprptVo.java index e90510ac..f998dd54 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqBaseMsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqBaseMsstbprptVo.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @Data @@ -46,10 +47,10 @@ public class EngEqBaseMsstbprptVo implements Serializable { private String stlc; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; @Schema(description = "高程") private Double elev; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhBaseInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhBaseInfoVo.java index 93105dc0..e10c44cd 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhBaseInfoVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhBaseInfoVo.java @@ -23,10 +23,10 @@ public class FhBaseInfoVo { private Integer blprd; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; @Schema(description = "高程") private Double elev; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprMsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprMsstbprptVo.java index 3482b334..be4a6d52 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprMsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprMsstbprptVo.java @@ -3,6 +3,7 @@ package com.yfd.platform.qgc_env.fpr.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; @Data @@ -40,10 +41,10 @@ public class FprMsstbprptVo { private Date tm; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; @Schema(description = "高程") private Double elev; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprdPointInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprdPointInfoVo.java index 81ea189f..6ac7036b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprdPointInfoVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprdPointInfoVo.java @@ -2,6 +2,8 @@ package com.yfd.platform.qgc_env.fpr.entity.vo; import lombok.Data; +import java.math.BigDecimal; + @Data public class FprdPointInfoVo { @@ -15,9 +17,9 @@ public class FprdPointInfoVo { private String bldstt; - private Double lttd; + private BigDecimal lttd; - private Double lgtd; + private BigDecimal lgtd; private Double dtmel; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java index 6a55e3c3..30bbd928 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java @@ -216,8 +216,8 @@ public class FprMonitorServiceImpl implements FprMonitorService { SiteAvoidanceUtils.calcSiteMapLev(resultList, FprdPointInfoVo::getStcd, - vo -> vo.getLgtd() != null ? java.math.BigDecimal.valueOf(vo.getLgtd()) : null, - vo -> vo.getLttd() != null ? java.math.BigDecimal.valueOf(vo.getLttd()) : null, + vo -> vo.getLgtd() != null ? vo.getLgtd() : null, + vo -> vo.getLttd() != null ? vo.getLttd() : null, FprdPointInfoVo::getAnchoPointState, FprdPointInfoVo::setDistance ); diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/overview/entity/vo/OverviewMsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/overview/entity/vo/OverviewMsstbprptVo.java index effa1e33..dd7732c1 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/overview/entity/vo/OverviewMsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/overview/entity/vo/OverviewMsstbprptVo.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @Data @@ -21,8 +22,8 @@ public class OverviewMsstbprptVo implements Serializable { private String sttpFullPath; private Integer sttpTreeLevel; private String blprdId; - private Double lgtd; - private Double lttd; + private BigDecimal lgtd; + private BigDecimal lttd; private Double dtmel; private String stlc; private Integer usfl; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/FhvapBuiltPointVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/FhvapBuiltPointVo.java index f71df8e4..5f4d8c60 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/FhvapBuiltPointVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/FhvapBuiltPointVo.java @@ -2,6 +2,8 @@ package com.yfd.platform.qgc_env.vap.entity.vo; import lombok.Data; +import java.math.BigDecimal; + @Data public class FhvapBuiltPointVo { @@ -15,9 +17,9 @@ public class FhvapBuiltPointVo { private String bldstt; - private Double lttd; + private BigDecimal lttd; - private Double lgtd; + private BigDecimal lgtd; private Double dtmel; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/VpVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/VpVmsstbprptVo.java index 12bbfcad..5d099b80 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/VpVmsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/VpVmsstbprptVo.java @@ -62,10 +62,10 @@ public class VpVmsstbprptVo implements Serializable { private Integer sttpTreeLevel; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; @Schema(description = "站址") private String stlc; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/WvaPointVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/WvaPointVo.java index ac2802b5..b6bbb8f2 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/WvaPointVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/WvaPointVo.java @@ -2,6 +2,8 @@ package com.yfd.platform.qgc_env.vap.entity.vo; import lombok.Data; +import java.math.BigDecimal; + @Data public class WvaPointVo { @@ -17,9 +19,9 @@ public class WvaPointVo { private String bldstt; - private Double lttd; + private BigDecimal lttd; - private Double lgtd; + private BigDecimal lgtd; private Double dtmel; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqBaseInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqBaseInfoVo.java index 0fc81648..afda0eb0 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqBaseInfoVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqBaseInfoVo.java @@ -3,6 +3,7 @@ package com.yfd.platform.qgc_env.wq.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; @Data @@ -22,10 +23,10 @@ public class WqBaseInfoVo { private String sttp; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; @Schema(description = "海拔") private Double elev; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtBaseInfoVO.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtBaseInfoVO.java index 18561f8f..adbd1315 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtBaseInfoVO.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtBaseInfoVO.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @Data @@ -99,8 +100,8 @@ public class SdWtBaseInfoVO implements Serializable { private String hbrvcdName; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtBaseInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtBaseInfoVo.java index 37d0f22f..8acf3809 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtBaseInfoVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtBaseInfoVo.java @@ -23,10 +23,10 @@ public class WtBaseInfoVo { private String sttp; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; @Schema(description = "海拔") private Double elev; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/zq/entity/vo/ZqBaseInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/zq/entity/vo/ZqBaseInfoVo.java index ed88d45b..2a666002 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/zq/entity/vo/ZqBaseInfoVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/zq/entity/vo/ZqBaseInfoVo.java @@ -3,6 +3,7 @@ package com.yfd.platform.qgc_env.zq.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; @Data @@ -25,10 +26,10 @@ public class ZqBaseInfoVo { private String sttpCode; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; @Schema(description = "水温设备类型") private Integer wtDeviceType; diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/domain/MsObliqueImageB.java b/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/domain/MsObliqueImageB.java index d3ea5efd..9c545c74 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/domain/MsObliqueImageB.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/domain/MsObliqueImageB.java @@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -91,11 +92,11 @@ public class MsObliqueImageB implements Serializable { /** 电站经度(非数据库字段) */ @TableField("LGTD") - private Double lgtd; + private BigDecimal lgtd; /** 电站纬度(非数据库字段) */ @TableField("LTTD") - private Double lttd; + private BigDecimal lttd; /** 电站坐标JSON串 */ @TableField("LOCATION")