From de29811448a5e67f1b761a94288bf42e8cea0c28 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Fri, 7 Feb 2025 18:29:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=8D=E7=BD=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8F=91=E9=80=81=E6=97=B6=E6=97=B6=E9=97=B4=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../genersoft/iot/vmp/storager/IRedisCatchStorage.java |  1 +
 .../genersoft/iot/vmp/storager/dao/GbStreamMapper.java | 10 ++++++++--
 数据库/2.7.1/更新-mysql-2.7.1.sql                      |  8 ++++++++
 数据库/2.7.1/更新-postgresql-kingbase-2.7.1.sql        | 10 +++++++++-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
index 6ee859aa..f77d8a05 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -125,6 +125,7 @@ public interface IRedisCatchStorage {
     void updateGpsMsgInfo(GPSMsgInfo gpsMsgInfo);
 
     GPSMsgInfo getGpsMsgInfo(String gbId);
+
     List<GPSMsgInfo> getAllGpsMsgInfo();
 
     Long getSN(String method);
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
index 5fe3980f..4de63a4b 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
@@ -77,7 +77,8 @@ public interface GbStreamMapper {
     GbStream queryStreamInPlatform(@Param("platformId") String platformId, @Param("gbId") String gbId);
 
     @Select("<script> "+
-            "select gt.gb_id as channel_id, gt.name, 'wvp-pro' as manufacture,  st.status, gt.longitude, gt.latitude, pc.id as parent_id," +
+            "select gt.gb_id as channel_id, gt.name, 'wvp-pro' as manufacture,  st.status, gt.longitude, gt.latitude, " +
+            "       gt.gps_speed, gt.gps_direction, gt.gps_altitude, gt.gps_time, pc.id as parent_id," +
             "       '1' as register_way, pc.civil_code_for_channel as civil_code, 'live' as model, 'wvp-pro' as owner, '0' as parental,'0' as secrecy" +
             " from wvp_gb_stream gt " +
             " left join (" +
@@ -136,7 +137,12 @@ public interface GbStreamMapper {
             "<foreach collection='gpsMsgInfos' item='item' separator=';'>" +
             " UPDATE" +
             " wvp_gb_stream" +
-            " SET longitude=#{item.lng}, latitude=#{item.lat} " +
+            " SET longitude=#{item.lng}" +
+            ", latitude=#{item.lat} " +
+            ", gps_time=#{item.time} " +
+            ", gps_speed=#{item.speed} " +
+            ", gps_direction=#{item.direction} " +
+            ", gps_altitude=#{item.speed} " +
             "WHERE gb_id=#{item.id}"+
             "</foreach>" +
             "</script>"})
diff --git a/数据库/2.7.1/更新-mysql-2.7.1.sql b/数据库/2.7.1/更新-mysql-2.7.1.sql
index 5821986a..31cc767e 100644
--- a/数据库/2.7.1/更新-mysql-2.7.1.sql
+++ b/数据库/2.7.1/更新-mysql-2.7.1.sql
@@ -11,3 +11,11 @@ alter table wvp_device_channel add gps_speed double precision;
 alter table wvp_device_channel add gps_direction character varying(255);
 
 alter table wvp_device_channel add gps_altitude character varying(255);
+
+alter table wvp_gb_stream add gps_time character varying(50);
+
+alter table wvp_gb_stream add gps_speed double precision;
+
+alter table wvp_gb_stream add gps_direction character varying(255);
+
+alter table wvp_gb_stream add gps_altitude character varying(255);
diff --git a/数据库/2.7.1/更新-postgresql-kingbase-2.7.1.sql b/数据库/2.7.1/更新-postgresql-kingbase-2.7.1.sql
index fc474b92..ed4f9f7a 100644
--- a/数据库/2.7.1/更新-postgresql-kingbase-2.7.1.sql
+++ b/数据库/2.7.1/更新-postgresql-kingbase-2.7.1.sql
@@ -10,4 +10,12 @@ alter table wvp_device_channel add gps_speed double precision;
 
 alter table wvp_device_channel add gps_direction character varying(255);
 
-alter table wvp_device_channel add gps_altitude character varying(255);
\ No newline at end of file
+alter table wvp_device_channel add gps_altitude character varying(255);
+
+alter table wvp_gb_stream add gps_time character varying(50);
+
+alter table wvp_gb_stream add gps_speed double precision;
+
+alter table wvp_gb_stream add gps_direction character varying(255);
+
+alter table wvp_gb_stream add gps_altitude character varying(255);
\ No newline at end of file