fix: 优化经纬度字段类型问题
This commit is contained in:
parent
777571930c
commit
dc61620464
@ -7,6 +7,7 @@ import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@ -54,12 +55,12 @@ public class SdAddvcdDic implements Serializable {
|
||||
/**
|
||||
* 中心经度
|
||||
*/
|
||||
private Double lgtd;
|
||||
private BigDecimal lgtd;
|
||||
|
||||
/**
|
||||
* 中心纬度
|
||||
*/
|
||||
private Double lttd;
|
||||
private BigDecimal lttd;
|
||||
|
||||
/**
|
||||
* 面积
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
/**
|
||||
* 面积
|
||||
|
||||
@ -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;
|
||||
}
|
||||
@ -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;
|
||||
|
||||
@ -210,12 +210,12 @@ public class FishDraftDataVO implements Serializable {
|
||||
/**
|
||||
* 电站经度(电站表)
|
||||
*/
|
||||
private Double lgtd;
|
||||
private BigDecimal lgtd;
|
||||
|
||||
/**
|
||||
* 电站纬度(电站表)
|
||||
*/
|
||||
private Double lttd;
|
||||
private BigDecimal lttd;
|
||||
|
||||
/**
|
||||
* 排序字段
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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
|
||||
);
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user