From 9e790eb0ff438121c8ca06021dbbb403aba84a83 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 16 五月 2023 17:17:24 +0800
Subject: [PATCH] 本地集成人大金仓连接jar
---
sql/2.6.8升级2.6.9.sql | 12 ++++++++----
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 10 +++++++++-
sql/初始化.sql | 1 -
libs/jdbc-aarch/postgresql-42.2.9.jre7.jar | 0
libs/jdbc-aarch/postgresql-42.2.9.jar | 0
pom.xml | 14 ++++++++++++--
libs/jdbc-aarch/kingbase8-8.6.0.jar | 0
libs/jdbc-aarch/kingbase8-8.6.0.jre7.jar | 0
8 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/libs/jdbc-aarch/kingbase8-8.6.0.jar b/libs/jdbc-aarch/kingbase8-8.6.0.jar
new file mode 100644
index 0000000..489bf53
--- /dev/null
+++ b/libs/jdbc-aarch/kingbase8-8.6.0.jar
Binary files differ
diff --git a/libs/jdbc-aarch/kingbase8-8.6.0.jre7.jar b/libs/jdbc-aarch/kingbase8-8.6.0.jre7.jar
new file mode 100644
index 0000000..28102eb
--- /dev/null
+++ b/libs/jdbc-aarch/kingbase8-8.6.0.jre7.jar
Binary files differ
diff --git a/libs/jdbc-aarch/postgresql-42.2.9.jar b/libs/jdbc-aarch/postgresql-42.2.9.jar
new file mode 100644
index 0000000..62d0b6d
--- /dev/null
+++ b/libs/jdbc-aarch/postgresql-42.2.9.jar
Binary files differ
diff --git a/libs/jdbc-aarch/postgresql-42.2.9.jre7.jar b/libs/jdbc-aarch/postgresql-42.2.9.jre7.jar
new file mode 100644
index 0000000..f6077b6
--- /dev/null
+++ b/libs/jdbc-aarch/postgresql-42.2.9.jre7.jar
Binary files differ
diff --git a/pom.xml b/pom.xml
index 90c385c..bb0de72 100644
--- a/pom.xml
+++ b/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>
<!--鍦ㄧ嚎鏂囨。 -->
diff --git "a/sql/2.6.8\345\215\207\347\272\2472.6.9.sql" "b/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
index 32baaa8..f27eebd 100644
--- "a/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
+++ "b/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
@@ -55,6 +55,9 @@
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
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
change self self bool default false;
+alter table wvp_stream_push
+ drop column serverId;
+
+
+
alter table user
change roleId role_id int not null;
diff --git "a/sql/\345\210\235\345\247\213\345\214\226.sql" "b/sql/\345\210\235\345\247\213\345\214\226.sql"
index b4db185..f29a924 100644
--- "a/sql/\345\210\235\345\247\213\345\214\226.sql"
+++ "b/sql/\345\210\235\345\247\213\345\214\226.sql"
@@ -252,7 +252,6 @@
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),
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
index 63fea06..45ed4f8 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
@@ -102,7 +102,15 @@
@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}")
--
Gitblit v1.8.0