From d78f76e58b3fea6c7e01731d42f1a2d956f937eb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Wed, 13 Mar 2024 18:18:23 +0800
Subject: [PATCH] =?UTF-8?q?1078-=E8=AE=BE=E5=A4=87=E6=B3=A8=E5=86=8C?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BB=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E6=A0=A1?=
=?UTF-8?q?=E9=AA=8C=E6=98=AF=E5=90=A6=E5=90=88=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../iot/vmp/jt1078/bean/JTDevice.java | 54 +++
.../iot/vmp/jt1078/dao/JTDeviceMapper.java | 28 ++
.../eventListener/RegisterEventListener.java | 2 +-
.../iot/vmp/jt1078/proc/request/J0100.java | 16 +-
.../iot/vmp/jt1078/proc/response/J8100.java | 5 +-
.../vmp/jt1078/service/Ijt1078Service.java | 5 +
.../service/impl/jt1078ServiceImpl.java | 17 +
数据库/JT1078-2.7.0/初始化-mysql-2.7.0.sql | 341 ++++++++++++++++++
.../初始化-postgresql-kingbase-2.7.0.sql | 341 ++++++++++++++++++
数据库/JT1078-2.7.0/更新-mysql-2.7.0.sql | 17 +
.../更新-postgresql-kingbase-2.7.0.sql | 17 +
11 files changed, 837 insertions(+), 6 deletions(-)
create mode 100644 src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTDeviceMapper.java
create mode 100644 数据库/JT1078-2.7.0/初始化-mysql-2.7.0.sql
create mode 100644 数据库/JT1078-2.7.0/初始化-postgresql-kingbase-2.7.0.sql
create mode 100644 数据库/JT1078-2.7.0/更新-mysql-2.7.0.sql
create mode 100644 数据库/JT1078-2.7.0/更新-postgresql-kingbase-2.7.0.sql
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDevice.java b/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDevice.java
index 4fa7f6288..749313189 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDevice.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDevice.java
@@ -1,45 +1,75 @@
package com.genersoft.iot.vmp.jt1078.bean;
+import io.swagger.v3.oas.annotations.media.Schema;
+
/**
* JT 设备
*/
+@Schema(description = "jt808设备")
public class JTDevice {
/**
* 省域ID
*/
+ @Schema(description = "省域ID")
private int provinceId;
/**
* 市县域ID
*/
+ @Schema(description = "市县域ID")
private int cityId;
/**
* 制造商ID
*/
+ @Schema(description = "制造商ID")
private String makerId;
/**
* 终端型号
*/
+ @Schema(description = "终端型号")
private String deviceModel;
/**
* 终端ID
*/
+ @Schema(description = "终端ID")
private String deviceId;
/**
* 车牌颜色
*/
+ @Schema(description = "车牌颜色")
private int plateColor;
/**
* 车牌
*/
+ @Schema(description = "车牌")
private String plateNo;
+ /**
+ * 鉴权码
+ */
+ @Schema(description = "鉴权码")
+ private String authenticationCode;
+
+ /**
+ * 经度
+ */
+ @Schema(description = "经度")
+ private Double longitude;
+
+ /**
+ * 纬度
+ */
+ @Schema(description = "纬度")
+ private Double latitude;
+
+
+
public int getProvinceId() {
return provinceId;
}
@@ -95,4 +125,28 @@ public class JTDevice {
public void setPlateNo(String plateNo) {
this.plateNo = plateNo;
}
+
+ public String getAuthenticationCode() {
+ return authenticationCode;
+ }
+
+ public void setAuthenticationCode(String authenticationCode) {
+ this.authenticationCode = authenticationCode;
+ }
+
+ public Double getLongitude() {
+ return longitude;
+ }
+
+ public void setLongitude(Double longitude) {
+ this.longitude = longitude;
+ }
+
+ public Double getLatitude() {
+ return latitude;
+ }
+
+ public void setLatitude(Double latitude) {
+ this.latitude = latitude;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTDeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTDeviceMapper.java
new file mode 100644
index 000000000..762aa9cc5
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTDeviceMapper.java
@@ -0,0 +1,28 @@
+package com.genersoft.iot.vmp.jt1078.dao;
+
+import com.genersoft.iot.vmp.jt1078.bean.JTDevice;
+import org.apache.ibatis.annotations.*;
+
+@Mapper
+public interface JTDeviceMapper {
+
+ @Select("SELECT * FROM wvp_device de where device_id=${devId}")
+ JTDevice getDevice(@Param("devId") String devId);
+
+ @Update(value = {" "})
+ void updateDevice(JTDevice device);
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/event/eventListener/RegisterEventListener.java b/src/main/java/com/genersoft/iot/vmp/jt1078/event/eventListener/RegisterEventListener.java
index a1d85cdd3..dfd6aca2b 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/event/eventListener/RegisterEventListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/event/eventListener/RegisterEventListener.java
@@ -10,6 +10,6 @@ public class RegisterEventListener implements ApplicationListener
@Override
public void onApplicationEvent(RegisterEvent event) {
- System.out.println("收到设备注册： "+ event.getDeviceId());
+ System.out.println("收到设备注册： "+ event.getDevice().getDeviceId());
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0100.java b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0100.java
index ba89416f6..b211c4e51 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0100.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0100.java
@@ -12,6 +12,7 @@ import io.netty.buffer.ByteBuf;
import org.springframework.context.ApplicationEvent;
import java.io.UnsupportedEncodingException;
+import java.util.UUID;
/**
* 终端注册
@@ -82,11 +83,20 @@ public class J0100 extends Re {
@Override
protected Rs handler(Header header, Session session, Ijt1078Service service) {
- // TODO 从数据库判断这个设备是否合法
J8100 j8100 = new J8100();
j8100.setRespNo(header.getSn());
- j8100.setResult(J8100.SUCCESS);
- j8100.setCode("WVP_YYDS");
+ // 从数据库判断这个设备是否合法
+ JTDevice deviceInDb = service.getDevice(header.getDevId());
+ if (deviceInDb != null) {
+ j8100.setResult(J8100.SUCCESS);
+ String authenticationCode = UUID.randomUUID().toString();
+ j8100.setCode(authenticationCode);
+ deviceInDb.setAuthenticationCode(authenticationCode);
+ service.updateDevice(deviceInDb);
+ }else {
+ j8100.setResult(J8100.FAIL);
+ // TODO 断开连接，清理资源
+ }
return j8100;
}
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8100.java b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8100.java
index 16b457abb..3014c2307 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8100.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8100.java
@@ -16,10 +16,11 @@ public class J8100 extends Rs {
* 0 成功
* 1 车辆已被注册
* 2 数据库中无该车辆
- * 2 终端已被注册
- * 2 数据库中无该终端
+ * 3 终端已被注册
+ * 4 数据库中无该终端
*/
public static final Integer SUCCESS = 0;
+ public static final Integer FAIL = 4;
Integer respNo;
Integer result;
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/service/Ijt1078Service.java b/src/main/java/com/genersoft/iot/vmp/jt1078/service/Ijt1078Service.java
index bcf7d4665..aed1cbeaf 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/service/Ijt1078Service.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/service/Ijt1078Service.java
@@ -1,4 +1,9 @@
package com.genersoft.iot.vmp.jt1078.service;
+import com.genersoft.iot.vmp.jt1078.bean.JTDevice;
+
public interface Ijt1078Service {
+ JTDevice getDevice(String devId);
+
+ void updateDevice(JTDevice deviceInDb);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java
index 115e8594a..df5cf2151 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java
@@ -1,8 +1,25 @@
package com.genersoft.iot.vmp.jt1078.service.impl;
+import com.genersoft.iot.vmp.jt1078.bean.JTDevice;
+import com.genersoft.iot.vmp.jt1078.dao.JTDeviceMapper;
import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class jt1078ServiceImpl implements Ijt1078Service {
+
+ @Autowired
+ private JTDeviceMapper jtDeviceMapper;
+
+
+ @Override
+ public JTDevice getDevice(String devId) {
+ return jtDeviceMapper.getDevice(devId);
+ }
+
+ @Override
+ public void updateDevice(JTDevice device) {
+ jtDeviceMapper.updateDevice(device);
+ }
}
diff --git a/数据库/JT1078-2.7.0/初始化-mysql-2.7.0.sql b/数据库/JT1078-2.7.0/初始化-mysql-2.7.0.sql
new file mode 100644
index 000000000..25929f3a8
--- /dev/null
+++ b/数据库/JT1078-2.7.0/初始化-mysql-2.7.0.sql
@@ -0,0 +1,341 @@
+/*建表*/
+create table wvp_device (
+ id serial primary key ,
+ device_id character varying(50) not null ,
+ name character varying(255),
+ manufacturer character varying(255),
+ model character varying(255),
+ firmware character varying(255),
+ transport character varying(50),
+ stream_mode character varying(50),
+ on_line bool default false,
+ register_time character varying(50),
+ keepalive_time character varying(50),
+ ip character varying(50),
+ create_time character varying(50),
+ update_time character varying(50),
+ port integer,
+ expires integer,
+ subscribe_cycle_for_catalog integer DEFAULT 0,
+ subscribe_cycle_for_mobile_position integer DEFAULT 0,
+ mobile_position_submission_interval integer DEFAULT 5,
+ subscribe_cycle_for_alarm integer DEFAULT 0,
+ host_address character varying(50),
+ charset character varying(50),
+ ssrc_check bool default false,
+ geo_coord_sys character varying(50),
+ media_server_id character varying(50),
+ custom_name character varying(255),
+ sdp_ip character varying(50),
+ local_ip character varying(50),
+ password character varying(255),
+ as_message_channel bool default false,
+ keepalive_interval_time integer,
+ switch_primary_sub_stream bool default false,
+ broadcast_push_after_ack bool default false,
+ constraint uk_device_device unique (device_id)
+);
+
+create table wvp_device_alarm (
+ id serial primary key ,
+ device_id character varying(50) not null,
+ channel_id character varying(50) not null,
+ alarm_priority character varying(50),
+ alarm_method character varying(50),
+ alarm_time character varying(50),
+ alarm_description character varying(255),
+ longitude double precision,
+ latitude double precision,
+ alarm_type character varying(50),
+ create_time character varying(50) not null
+);
+
+create table wvp_device_channel (
+ id serial primary key ,
+ channel_id character varying(50) not null,
+ name character varying(255),
+ custom_name character varying(255),
+ manufacture character varying(50),
+ model character varying(50),
+ owner character varying(50),
+ civil_code character varying(50),
+ block character varying(50),
+ address character varying(50),
+ parent_id character varying(50),
+ safety_way integer,
+ register_way integer,
+ cert_num character varying(50),
+ certifiable integer,
+ err_code integer,
+ end_time character varying(50),
+ secrecy character varying(50),
+ ip_address character varying(50),
+ port integer,
+ password character varying(255),
+ ptz_type integer,
+ custom_ptz_type integer,
+ status bool default false,
+ longitude double precision,
+ custom_longitude double precision,
+ latitude double precision,
+ custom_latitude double precision,
+ stream_id character varying(255),
+ device_id character varying(50) not null,
+ parental character varying(50),
+ has_audio bool default false,
+ create_time character varying(50) not null,
+ update_time character varying(50) not null,
+ sub_count integer,
+ longitude_gcj02 double precision,
+ latitude_gcj02 double precision,
+ longitude_wgs84 double precision,
+ latitude_wgs84 double precision,
+ business_group_id character varying(50),
+ gps_time character varying(50),
+ stream_identification character varying(50),
+ constraint uk_wvp_device_channel_unique_device_channel unique (device_id, channel_id)
+);
+
+create table wvp_device_mobile_position (
+ id serial primary key,
+ device_id character varying(50) not null,
+ channel_id character varying(50) not null,
+ device_name character varying(255),
+ time character varying(50),
+ longitude double precision,
+ latitude double precision,
+ altitude double precision,
+ speed double precision,
+ direction double precision,
+ report_source character varying(50),
+ longitude_gcj02 double precision,
+ latitude_gcj02 double precision,
+ longitude_wgs84 double precision,
+ latitude_wgs84 double precision,
+ create_time character varying(50)
+);
+
+create table wvp_gb_stream (
+ gb_stream_id serial primary key,
+ app character varying(255) not null,
+ stream character varying(255) not null,
+ gb_id character varying(50) not null,
+ name character varying(255),
+ longitude double precision,
+ latitude double precision,
+ stream_type character varying(50),
+ media_server_id character varying(50),
+ create_time character varying(50),
+ constraint uk_gb_stream_unique_gb_id unique (gb_id),
+ constraint uk_gb_stream_unique_app_stream unique (app, stream)
+);
+
+create table wvp_log (
+ id serial primary key ,
+ name character varying(50),
+ type character varying(50),
+ uri character varying(200),
+ address character varying(50),
+ result character varying(50),
+ timing bigint,
+ username character varying(50),
+ create_time character varying(50)
+);
+
+create table wvp_media_server (
+ id character varying(255) primary key ,
+ ip character varying(50),
+ hook_ip character varying(50),
+ sdp_ip character varying(50),
+ stream_ip character varying(50),
+ http_port integer,
+ http_ssl_port integer,
+ rtmp_port integer,
+ rtmp_ssl_port integer,
+ rtp_proxy_port integer,
+ rtsp_port integer,
+ rtsp_ssl_port integer,
+ auto_config bool default false,
+ secret character varying(50),
+ rtp_enable bool default false,
+ rtp_port_range character varying(50),
+ send_rtp_port_range character varying(50),
+ record_assist_port integer,
+ default_server bool default false,
+ create_time character varying(50),
+ update_time character varying(50),
+ hook_alive_interval integer,
+ record_path character varying(255),
+ record_day integer default 7,
+ constraint uk_media_server_unique_ip_http_port unique (ip, http_port)
+);
+
+create table wvp_platform (
+ id serial primary key ,
+ enable bool default false,
+ name character varying(255),
+ server_gb_id character varying(50),
+ server_gb_domain character varying(50),
+ server_ip character varying(50),
+ server_port integer,
+ device_gb_id character varying(50),
+ device_ip character varying(50),
+ device_port character varying(50),
+ username character varying(255),
+ password character varying(50),
+ expires character varying(50),
+ keep_timeout character varying(50),
+ transport character varying(50),
+ character_set character varying(50),
+ catalog_id character varying(50),
+ ptz bool default false,
+ rtcp bool default false,
+ status bool default false,
+ start_offline_push bool default false,
+ administrative_division character varying(50),
+ catalog_group integer,
+ create_time character varying(50),
+ update_time character varying(50),
+ as_message_channel bool default false,
+ auto_push_channel bool default false,
+ constraint uk_platform_unique_server_gb_id unique (server_gb_id)
+);
+
+create table wvp_platform_catalog (
+ id character varying(50),
+ platform_id character varying(50),
+ name character varying(255),
+ parent_id character varying(50),
+ civil_code character varying(50),
+ business_group_id character varying(50),
+ constraint uk_platform_catalog_id_platform_id unique (id, platform_id)
+);
+
+create table wvp_platform_gb_channel (
+ id serial primary key ,
+ platform_id character varying(50),
+ catalog_id character varying(50),
+ device_channel_id integer,
+ constraint uk_platform_gb_channel_platform_id_catalog_id_device_channel_id unique (platform_id, catalog_id, device_channel_id)
+);
+
+create table wvp_platform_gb_stream (
+ id serial primary key,
+ platform_id character varying(50),
+ catalog_id character varying(50),
+ gb_stream_id integer,
+ constraint uk_platform_gb_stream_platform_id_catalog_id_gb_stream_id unique (platform_id, catalog_id, gb_stream_id)
+);
+
+create table wvp_stream_proxy (
+ id serial primary key,
+ type character varying(50),
+ app character varying(255),
+ stream character varying(255),
+ url character varying(255),
+ src_url character varying(255),
+ dst_url character varying(255),
+ timeout_ms integer,
+ ffmpeg_cmd_key character varying(255),
+ rtp_type character varying(50),
+ media_server_id character varying(50),
+ enable_audio bool default false,
+ enable_mp4 bool default false,
+ enable bool default false,
+ status boolean,
+ enable_remove_none_reader bool default false,
+ create_time character varying(50),
+ name character varying(255),
+ update_time character varying(50),
+ stream_key character varying(255),
+ enable_disable_none_reader bool default false,
+ constraint uk_stream_proxy_app_stream unique (app, stream)
+);
+
+create table wvp_stream_push (
+ id serial primary key,
+ app character varying(255),
+ stream character varying(255),
+ total_reader_count character varying(50),
+ origin_type integer,
+ origin_type_str character varying(50),
+ 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),
+ push_ing bool default false,
+ self bool default false,
+ constraint uk_stream_push_app_stream unique (app, stream)
+);
+create table wvp_cloud_record (
+ id serial primary key,
+ app character varying(255),
+ stream character varying(255),
+ call_id character varying(255),
+ start_time bigint,
+ end_time bigint,
+ media_server_id character varying(50),
+ file_name character varying(255),
+ folder character varying(255),
+ file_path character varying(255),
+ collect bool default false,
+ file_size bigint,
+ time_len bigint,
+ constraint uk_stream_push_app_stream_path unique (app, stream, file_path)
+);
+
+create table wvp_user (
+ id serial primary key,
+ username character varying(255),
+ password character varying(255),
+ role_id integer,
+ create_time character varying(50),
+ update_time character varying(50),
+ push_key character varying(50),
+ constraint uk_user_username unique (username)
+);
+
+create table wvp_user_role (
+ id serial primary key,
+ name character varying(50),
+ authority character varying(50),
+ create_time character varying(50),
+ update_time character varying(50)
+);
+create table wvp_resources_tree (
+ id serial primary key ,
+ is_catalog bool default true,
+ device_channel_id integer ,
+ gb_stream_id integer,
+ name character varying(255),
+ parentId integer,
+ path character varying(255)
+);
+
+create table wvp_jt_device (
+ id serial primary key,
+ device_id character varying(50) not null,
+ province_id character varying(50),
+ city_id character varying(50),
+ maker_id character varying(50),
+ device_model character varying(50),
+ plate_color character varying(50),
+ plate_no character varying(50),
+ authentication_code character varying(255),
+ longitude double precision,
+ latitude double precision,
+ status bool default false,
+ update_time character varying(50) not null,
+ create_time character varying(50) not null,
+ constraint uk_jt_device_id_device_id unique (id, device_id)
+);
+
+/*初始数据*/
+INSERT INTO wvp_user VALUES (1, 'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021-04-13 14:14:57','2021-04-13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3');
+INSERT INTO wvp_user_role VALUES (1, 'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');
+
+
+
diff --git a/数据库/JT1078-2.7.0/初始化-postgresql-kingbase-2.7.0.sql b/数据库/JT1078-2.7.0/初始化-postgresql-kingbase-2.7.0.sql
new file mode 100644
index 000000000..65748364d
--- /dev/null
+++ b/数据库/JT1078-2.7.0/初始化-postgresql-kingbase-2.7.0.sql
@@ -0,0 +1,341 @@
+/*建表*/
+create table wvp_device (
+ id serial primary key ,
+ device_id character varying(50) not null ,
+ name character varying(255),
+ manufacturer character varying(255),
+ model character varying(255),
+ firmware character varying(255),
+ transport character varying(50),
+ stream_mode character varying(50),
+ on_line bool default false,
+ register_time character varying(50),
+ keepalive_time character varying(50),
+ ip character varying(50),
+ create_time character varying(50),
+ update_time character varying(50),
+ port integer,
+ expires integer,
+ subscribe_cycle_for_catalog integer DEFAULT 0,
+ subscribe_cycle_for_mobile_position integer DEFAULT 0,
+ mobile_position_submission_interval integer DEFAULT 5,
+ subscribe_cycle_for_alarm integer DEFAULT 0,
+ host_address character varying(50),
+ charset character varying(50),
+ ssrc_check bool default false,
+ geo_coord_sys character varying(50),
+ media_server_id character varying(50),
+ custom_name character varying(255),
+ sdp_ip character varying(50),
+ local_ip character varying(50),
+ password character varying(255),
+ as_message_channel bool default false,
+ keepalive_interval_time integer,
+ switch_primary_sub_stream bool default false,
+ broadcast_push_after_ack bool default false,
+ constraint uk_device_device unique (device_id)
+);
+
+create table wvp_device_alarm (
+ id serial primary key ,
+ device_id character varying(50) not null,
+ channel_id character varying(50) not null,
+ alarm_priority character varying(50),
+ alarm_method character varying(50),
+ alarm_time character varying(50),
+ alarm_description character varying(255),
+ longitude double precision,
+ latitude double precision,
+ alarm_type character varying(50),
+ create_time character varying(50) not null
+);
+
+create table wvp_device_channel (
+ id serial primary key ,
+ channel_id character varying(50) not null,
+ name character varying(255),
+ custom_name character varying(255),
+ manufacture character varying(50),
+ model character varying(50),
+ owner character varying(50),
+ civil_code character varying(50),
+ block character varying(50),
+ address character varying(50),
+ parent_id character varying(50),
+ safety_way integer,
+ register_way integer,
+ cert_num character varying(50),
+ certifiable integer,
+ err_code integer,
+ end_time character varying(50),
+ secrecy character varying(50),
+ ip_address character varying(50),
+ port integer,
+ password character varying(255),
+ ptz_type integer,
+ custom_ptz_type integer,
+ status bool default false,
+ longitude double precision,
+ custom_longitude double precision,
+ latitude double precision,
+ custom_latitude double precision,
+ stream_id character varying(255),
+ device_id character varying(50) not null,
+ parental character varying(50),
+ has_audio bool default false,
+ create_time character varying(50) not null,
+ update_time character varying(50) not null,
+ sub_count integer,
+ longitude_gcj02 double precision,
+ latitude_gcj02 double precision,
+ longitude_wgs84 double precision,
+ latitude_wgs84 double precision,
+ business_group_id character varying(50),
+ gps_time character varying(50),
+ stream_identification character varying(50),
+ constraint uk_wvp_device_channel_unique_device_channel unique (device_id, channel_id)
+);
+
+create table wvp_device_mobile_position (
+ id serial primary key,
+ device_id character varying(50) not null,
+ channel_id character varying(50) not null,
+ device_name character varying(255),
+ time character varying(50),
+ longitude double precision,
+ latitude double precision,
+ altitude double precision,
+ speed double precision,
+ direction double precision,
+ report_source character varying(50),
+ longitude_gcj02 double precision,
+ latitude_gcj02 double precision,
+ longitude_wgs84 double precision,
+ latitude_wgs84 double precision,
+ create_time character varying(50)
+);
+
+create table wvp_gb_stream (
+ gb_stream_id serial primary key,
+ app character varying(255) not null,
+ stream character varying(255) not null,
+ gb_id character varying(50) not null,
+ name character varying(255),
+ longitude double precision,
+ latitude double precision,
+ stream_type character varying(50),
+ media_server_id character varying(50),
+ create_time character varying(50),
+ constraint uk_gb_stream_unique_gb_id unique (gb_id),
+ constraint uk_gb_stream_unique_app_stream unique (app, stream)
+);
+
+create table wvp_log (
+ id serial primary key ,
+ name character varying(50),
+ type character varying(50),
+ uri character varying(200),
+ address character varying(50),
+ result character varying(50),
+ timing bigint,
+ username character varying(50),
+ create_time character varying(50)
+);
+
+create table wvp_media_server (
+ id character varying(255) primary key ,
+ ip character varying(50),
+ hook_ip character varying(50),
+ sdp_ip character varying(50),
+ stream_ip character varying(50),
+ http_port integer,
+ http_ssl_port integer,
+ rtmp_port integer,
+ rtmp_ssl_port integer,
+ rtp_proxy_port integer,
+ rtsp_port integer,
+ rtsp_ssl_port integer,
+ auto_config bool default false,
+ secret character varying(50),
+ rtp_enable bool default false,
+ rtp_port_range character varying(50),
+ send_rtp_port_range character varying(50),
+ record_assist_port integer,
+ default_server bool default false,
+ create_time character varying(50),
+ update_time character varying(50),
+ hook_alive_interval integer,
+ record_path character varying(255),
+ record_day integer default 7,
+ constraint uk_media_server_unique_ip_http_port unique (ip, http_port)
+);
+
+create table wvp_platform (
+ id serial primary key ,
+ enable bool default false,
+ name character varying(255),
+ server_gb_id character varying(50),
+ server_gb_domain character varying(50),
+ server_ip character varying(50),
+ server_port integer,
+ device_gb_id character varying(50),
+ device_ip character varying(50),
+ device_port character varying(50),
+ username character varying(255),
+ password character varying(50),
+ expires character varying(50),
+ keep_timeout character varying(50),
+ transport character varying(50),
+ character_set character varying(50),
+ catalog_id character varying(50),
+ ptz bool default false,
+ rtcp bool default false,
+ status bool default false,
+ start_offline_push bool default false,
+ administrative_division character varying(50),
+ catalog_group integer,
+ create_time character varying(50),
+ update_time character varying(50),
+ as_message_channel bool default false,
+ auto_push_channel bool default false,
+ constraint uk_platform_unique_server_gb_id unique (server_gb_id)
+);
+
+create table wvp_platform_catalog (
+ id character varying(50),
+ platform_id character varying(50),
+ name character varying(255),
+ parent_id character varying(50),
+ civil_code character varying(50),
+ business_group_id character varying(50),
+ constraint uk_platform_catalog_id_platform_id unique (id, platform_id)
+);
+
+create table wvp_platform_gb_channel (
+ id serial primary key ,
+ platform_id character varying(50),
+ catalog_id character varying(50),
+ device_channel_id integer,
+ constraint uk_platform_gb_channel_platform_id_catalog_id_device_channel_id unique (platform_id, catalog_id, device_channel_id)
+);
+
+create table wvp_platform_gb_stream (
+ id serial primary key,
+ platform_id character varying(50),
+ catalog_id character varying(50),
+ gb_stream_id integer,
+ constraint uk_platform_gb_stream_platform_id_catalog_id_gb_stream_id unique (platform_id, catalog_id, gb_stream_id)
+);
+
+create table wvp_stream_proxy (
+ id serial primary key,
+ type character varying(50),
+ app character varying(255),
+ stream character varying(255),
+ url character varying(255),
+ src_url character varying(255),
+ dst_url character varying(255),
+ timeout_ms integer,
+ ffmpeg_cmd_key character varying(255),
+ rtp_type character varying(50),
+ media_server_id character varying(50),
+ enable_audio bool default false,
+ enable_mp4 bool default false,
+ enable bool default false,
+ status boolean,
+ enable_remove_none_reader bool default false,
+ create_time character varying(50),
+ name character varying(255),
+ update_time character varying(50),
+ stream_key character varying(255),
+ enable_disable_none_reader bool default false,
+ constraint uk_stream_proxy_app_stream unique (app, stream)
+);
+
+create table wvp_stream_push (
+ id serial primary key,
+ app character varying(255),
+ stream character varying(255),
+ total_reader_count character varying(50),
+ origin_type integer,
+ origin_type_str character varying(50),
+ 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),
+ push_ing bool default false,
+ self bool default false,
+ constraint uk_stream_push_app_stream unique (app, stream)
+);
+create table wvp_cloud_record (
+ id serial primary key,
+ app character varying(255),
+ stream character varying(255),
+ call_id character varying(255),
+ start_time int8,
+ end_time int8,
+ media_server_id character varying(50),
+ file_name character varying(255),
+ folder character varying(255),
+ file_path character varying(255),
+ collect bool default false,
+ file_size int8,
+ time_len int8,
+ constraint uk_stream_push_app_stream_path unique (app, stream, file_path)
+);
+
+create table wvp_user (
+ id serial primary key,
+ username character varying(255),
+ password character varying(255),
+ role_id integer,
+ create_time character varying(50),
+ update_time character varying(50),
+ push_key character varying(50),
+ constraint uk_user_username unique (username)
+);
+
+create table wvp_user_role (
+ id serial primary key,
+ name character varying(50),
+ authority character varying(50),
+ create_time character varying(50),
+ update_time character varying(50)
+);
+create table wvp_resources_tree (
+ id serial primary key ,
+ is_catalog bool default true,
+ device_channel_id integer ,
+ gb_stream_id integer,
+ name character varying(255),
+ parentId integer,
+ path character varying(255)
+);
+
+create table wvp_jt_device (
+ id serial primary key,
+ device_id character varying(50) not null,
+ province_id character varying(50),
+ city_id character varying(50),
+ maker_id character varying(50),
+ device_model character varying(50),
+ plate_color character varying(50),
+ plate_no character varying(50),
+ authentication_code character varying(255),
+ longitude double precision,
+ latitude double precision,
+ status bool default false,
+ update_time character varying(50) not null,
+ create_time character varying(50) not null,
+ constraint uk_jt_device_id_device_id unique (id, device_id)
+);
+
+/*初始数据*/
+INSERT INTO wvp_user VALUES (1, 'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021-04-13 14:14:57','2021-04-13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3');
+INSERT INTO wvp_user_role VALUES (1, 'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');
+
+
+
diff --git a/数据库/JT1078-2.7.0/更新-mysql-2.7.0.sql b/数据库/JT1078-2.7.0/更新-mysql-2.7.0.sql
new file mode 100644
index 000000000..3b00bdb6c
--- /dev/null
+++ b/数据库/JT1078-2.7.0/更新-mysql-2.7.0.sql
@@ -0,0 +1,17 @@
+create table wvp_jt_device (
+ id serial primary key,
+ device_id character varying(50) not null,
+ province_id character varying(50),
+ city_id character varying(50),
+ maker_id character varying(50),
+ device_model character varying(50),
+ plate_color character varying(50),
+ plate_no character varying(50),
+ authentication_code character varying(255),
+ longitude double precision,
+ latitude double precision,
+ status bool default false,
+ update_time character varying(50) not null,
+ create_time character varying(50) not null,
+ constraint uk_jt_device_id_device_id unique (id, device_id)
+);
\ No newline at end of file
diff --git a/数据库/JT1078-2.7.0/更新-postgresql-kingbase-2.7.0.sql b/数据库/JT1078-2.7.0/更新-postgresql-kingbase-2.7.0.sql
new file mode 100644
index 000000000..6b70ecd39
--- /dev/null
+++ b/数据库/JT1078-2.7.0/更新-postgresql-kingbase-2.7.0.sql
@@ -0,0 +1,17 @@
+create table wvp_jt_device (
+ id serial primary key,
+ device_id character varying(50) not null,
+ province_id character varying(50),
+ city_id character varying(50),
+ maker_id character varying(50),
+ device_model character varying(50),
+ plate_color character varying(50),
+ plate_no character varying(50),
+ authentication_code character varying(255),
+ longitude double precision,
+ latitude double precision,
+ status bool default false,
+ update_time character varying(50) not null,
+ create_time character varying(50) not null,
+ constraint uk_jt_device_id_device_id unique (id, device_id)
+);
\ No newline at end of file