本地集成人大金仓连接jar

pom.xml

@@ -142,13 +142,23 @@
 			<version>42.5.1</version>
 		</dependency>
 
-
+		<!-- kingbase人大金仓 -->
+		<!-- 手动下载驱动后安装 -->
+		<!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8 -Dversion=8.6.0 -Dpackaging=jar
+ -->
+		<dependency>
+			<groupId>com.kingbase</groupId>
+			<artifactId>kingbase8</artifactId>
+			<version>8.6.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>
+		</dependency>
 
 		<!--Mybatis分页插件 -->
 		<dependency>
 			<groupId>com.github.pagehelper</groupId>
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
-			<version>1.4.3</version>
+			<version>1.4.6</version>
 		</dependency>
 
 		<!--在线文档 -->

sql/2.6.8升级2.6.9.sql

@@ -55,6 +55,9 @@ alter table device
 alter table device
     change keepaliveIntervalTime keepalive_interval_time int null;
 
+alter table device
+    change online on_line varchar(50) null;
+
 alter table device_alarm
     change deviceId device_id varchar(50) not null;
 
@@ -393,10 +396,6 @@ alter table stream_push
 alter table stream_push
     change status status bool default false;
 
-
-alter table stream_push
-    change serverId server_id varchar(50) not null;
-
 alter table stream_push
     change pushTime push_time varchar(50) null;
 
@@ -412,6 +411,11 @@ alter table stream_push
 alter table stream_push
     change self self bool default false;
 
+alter table wvp_stream_push
+    drop column serverId;
+
+
+
 alter table user
     change roleId role_id int not null;
 

sql/初始化.sql

@@ -252,7 +252,6 @@ create table wvp_stream_push (
                                  create_time character varying(50),
                                  alive_second integer,
                                  media_server_id character varying(50),
-                                 server_id character varying(50),
                                  push_time character varying(50),
                                  status bool default false,
                                  update_time character varying(50),

src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java

@@ -102,7 +102,15 @@ public interface StreamPushMapper {
     @Delete("DELETE FROM wvp_stream_push")
     void clear();
 
-    @Delete("DELETE sp FROM wvp_stream_push sp left join wvp_gb_stream gs on gs.app = sp.app and gs.stream= sp.stream WHERE sp.media_server_id=#{mediaServerId} and gs.gb_id is null ")
+    @Delete("delete" +
+            " from wvp_stream_push " +
+            " where id in " +
+            "   (select temp.id from " +
+            "       (select wgs.gb_stream_id as id " +
+            "          from wvp_gb_stream wgs" +
+            "               left join wvp_stream_push sp on sp.id = wgs.gb_stream_id" +
+            "           where wgs.gb_id is null and wgs.media_server_id = #{mediaServerId}) temp)"
+            )
     void deleteWithoutGBId(String mediaServerId);
 
     @Select("SELECT * FROM wvp_stream_push WHERE media_server_id=#{mediaServerId}")