From 3de97c2e4039bc7f62f630024721357131663786 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Wed, 11 Dec 2024 11:40:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=9A=E9=81=93=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/gb28181/bean/DeviceChannel.java    | 18 +++++++++---------
 .../vmp/storager/dao/DeviceChannelMapper.java  |  2 --
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
index 6e230afe..36c13eea 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -190,13 +190,13 @@ public class DeviceChannel {
 	 * 经度
 	 */
 	@Schema(description = "自定义经度")
-	private double customLongitude;
+	private Double customLongitude;
 
 	/**
 	 * 纬度
 	 */
 	@Schema(description = "自定义纬度")
-	private double customLatitude;
+	private Double customLatitude;
 
 	/**
 	 * 经度 GCJ02
@@ -599,19 +599,19 @@ public class DeviceChannel {
 		this.streamIdentification = streamIdentification;
 	}
 
-	public double getCustomLongitude() {
+	public Double getCustomLongitude() {
 		return customLongitude;
 	}
 
-	public void setCustomLongitude(double customLongitude) {
+	public void setCustomLongitude(Double customLongitude) {
 		this.customLongitude = customLongitude;
 	}
 
-	public double getCustomLatitude() {
-		return customLatitude;
-	}
-
-	public void setCustomLatitude(double customLatitude) {
+	public void setCustomLatitude(Double customLatitude) {
 		this.customLatitude = customLatitude;
 	}
+
+	public Double getCustomLatitude() {
+		return customLatitude;
+	}
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
index 10d0ee1c..48efbb78 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -347,8 +347,6 @@ public interface DeviceChannelMapper {
             "<if test='item.hasAudio != null'>, has_audio=#{item.hasAudio}</if>" +
             "<if test='item.longitude != null'>, longitude=#{item.longitude}</if>" +
             "<if test='item.latitude != null'>, latitude=#{item.latitude}</if>" +
-            "<if test='item.customLongitude != null'>, custom_longitude=#{item.customLongitude}</if>" +
-            "<if test='item.customLatitude != null'>, custom_latitude=#{item.customLatitude}</if>" +
             "<if test='item.longitudeGcj02 != null'>, longitude_gcj02=#{item.longitudeGcj02}</if>" +
             "<if test='item.latitudeGcj02 != null'>, latitude_gcj02=#{item.latitudeGcj02}</if>" +
             "<if test='item.longitudeWgs84 != null'>, longitude_wgs84=#{item.longitudeWgs84}</if>" +