From a4ca333abb487acd13526efca84e3712e7ff6be3 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Sun, 10 Nov 2024 22:09:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B8=BB=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gb28181/dao/CommonGBChannelMapper.java | 5 ++- .../gb28181/dao/PlatformChannelMapper.java | 6 +++ .../gb28181/dao/provider/ChannelProvider.java | 6 +++ .../service/impl/jt1078PlayServiceImpl.java | 4 +- web_src/src/components/JTDeviceList.vue | 2 +- web_src/src/router/index.js | 9 ----- 数据库/2.7.3/初始化-mysql-2.7.3.sql | 37 ++++++++++++++++++- .../2.7.3/初始化-postgresql-kingbase-2.7.3.sql | 37 ++++++++++++++++++- 数据库/JT1078-2.7.2/初始化-mysql-2.7.2.sql | 31 ---------------- 9 files changed, 91 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java index caa8fa08b..8e775345f 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java @@ -22,6 +22,7 @@ public interface CommonGBChannelMapper { "gb_device_id," + " stream_proxy_id," + " stream_push_id," + + " jt_channel_id," + "create_time," + "update_time," + "gb_name," + @@ -61,6 +62,7 @@ public interface CommonGBChannelMapper { "#{gbDeviceId}, " + " #{streamProxyId}," + " #{streamPushId}," + + " #{jtChannelId}," + "#{createTime}, " + "#{updateTime}, " + "#{gbName}, " + @@ -169,6 +171,7 @@ public interface CommonGBChannelMapper { "gb_device_id," + "stream_proxy_id, " + "stream_push_id," + + "jt_channel_id," + "create_time," + "update_time," + "gb_name," + @@ -206,7 +209,7 @@ public interface CommonGBChannelMapper { "gb_svc_time_support_mode ) " + "VALUES" + " " + - "(#{item.gbDeviceId}, #{item.streamProxyId}, #{item.streamPushId},#{item.createTime},#{item.updateTime}," + + "(#{item.gbDeviceId}, #{item.streamProxyId}, #{item.streamPushId}, #{item.jtChannelId},#{item.createTime},#{item.updateTime}," + "#{item.gbName},#{item.gbManufacturer}, #{item.gbModel}," + "#{item.gbOwner},#{item.gbCivilCode},#{item.gbBlock}, #{item.gbAddress}, #{item.gbParental}, #{item.gbParentId},#{item.gbSafetyWay}, " + "#{item.gbRegisterWay},#{item.gbCertNum},#{item.gbCertifiable},#{item.gbErrCode},#{item.gbEndTime}, #{item.gbSecrecy},#{item.gbIpAddress}," + diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java index d23eec4ba..5e24201ea 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java @@ -68,6 +68,7 @@ public interface PlatformChannelMapper { " wdc.device_db_id as gb_device_db_id,\n" + " wdc.stream_push_id,\n" + " wdc.stream_proxy_id,\n" + + " wdc.jt_channel_id,\n" + " wdc.create_time,\n" + " wdc.update_time,\n" + " wpgc.custom_device_id, \n" + @@ -152,6 +153,7 @@ public interface PlatformChannelMapper { " AND wdc.device_db_id is not null " + " AND wdc.stream_push_id is not null " + " AND wdc.stream_proxy_id is not null " + + " AND wdc.jt_channel_id is not null " + "") List queryForPlatformForWebList(@Param("platformId") Integer platformId, @Param("query") String query, @Param("channelType") Integer channelType, @Param("online") Boolean online, @@ -162,6 +164,7 @@ public interface PlatformChannelMapper { " wdc.device_db_id as gb_device_db_id,\n" + " wdc.stream_push_id,\n" + " wdc.stream_proxy_id,\n" + + " wdc.jt_channel_id,\n" + " wdc.create_time,\n" + " wdc.update_time,\n" + " coalesce(wpgc.custom_device_id, wdc.gb_device_id, wdc.device_id) as gb_device_id,\n" + @@ -212,6 +215,7 @@ public interface PlatformChannelMapper { " wdc.device_db_id as gb_device_db_id,\n" + " wdc.stream_push_id,\n" + " wdc.stream_proxy_id,\n" + + " wdc.jt_channel_id,\n" + " wdc.create_time,\n" + " wdc.update_time,\n" + " coalesce(wpgc.custom_device_id, wdc.gb_device_id, wdc.device_id) as gb_device_id,\n" + @@ -263,6 +267,7 @@ public interface PlatformChannelMapper { " wdc.device_db_id as gb_device_db_id,\n" + " wdc.stream_push_id,\n" + " wdc.stream_proxy_id,\n" + + " wdc.jt_channel_id,\n" + " wdc.create_time,\n" + " wdc.update_time,\n" + " coalesce(wpgc.custom_device_id, wdc.gb_device_id, wdc.device_id) as gb_device_id,\n" + @@ -488,6 +493,7 @@ public interface PlatformChannelMapper { " wdc.device_db_id as gb_device_db_id,\n" + " wdc.stream_push_id,\n" + " wdc.stream_proxy_id,\n" + + " wdc.jt_channel_id,\n" + " wdc.create_time,\n" + " wdc.update_time,\n" + " coalesce(wpgc.custom_device_id, wdc.gb_device_id, wdc.device_id) as gb_device_id,\n" + diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java index 2fe3dc5ef..9a5334ce3 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java @@ -15,6 +15,7 @@ public class ChannelProvider { " device_db_id as gb_device_db_id,\n" + " stream_push_id,\n" + " stream_proxy_id,\n" + + " jt_channel_id,\n" + " create_time,\n" + " update_time,\n" + " coalesce(gb_device_id, device_id) as gb_device_id,\n" + @@ -60,6 +61,7 @@ public class ChannelProvider { " wdc.device_db_id as gb_device_db_id,\n" + " wdc.stream_push_id,\n" + " wdc.stream_proxy_id,\n" + + " wdc.jt_channel_id,\n" + " wdc.create_time,\n" + " wdc.update_time,\n" + " coalesce(wpgc.custom_device_id, wdc.gb_device_id, wdc.device_id) as gb_device_id,\n" + @@ -144,6 +146,8 @@ public class ChannelProvider { sqlBuild.append(" AND stream_push_id is not null"); }else if ((Integer)params.get("channelType") == 2) { sqlBuild.append(" AND stream_proxy_id is not null"); + }else if ((Integer)params.get("channelType") == 4) { + sqlBuild.append(" AND jt_channel_id is not null"); } } return sqlBuild.toString(); @@ -177,6 +181,8 @@ public class ChannelProvider { sqlBuild.append(" AND stream_push_id is not null"); }else if ((Integer)params.get("channelType") == 2) { sqlBuild.append(" AND stream_proxy_id is not null"); + }else if ((Integer)params.get("channelType") == 4) { + sqlBuild.append(" AND jt_channel_id is not null"); } } return sqlBuild.toString(); diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078PlayServiceImpl.java index fa8f5689d..d5d71da85 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078PlayServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078PlayServiceImpl.java @@ -106,7 +106,7 @@ public class jt1078PlayServiceImpl implements Ijt1078PlayService { @Async("taskExecutor") @EventListener public void onApplicationEvent(MediaNotFoundEvent event) { - if (!userSetting.isAutoApplyPlay()) { + if (!userSetting.getAutoApplyPlay()) { return; } JTMediaStreamType jtMediaStreamType = checkStreamFromJt(event.getStream()); @@ -250,7 +250,7 @@ public class jt1078PlayServiceImpl implements Ijt1078PlayService { log.info("[1078-点播] phoneNumber： {}， channelId： {}， 端口： {}", phoneNumber, channelId, ssrcInfo.getPort()); J9101 j9101 = new J9101(); - j9101.setChannel(Integer.valueOf(channelId)); + j9101.setChannel(channelId); j9101.setIp(mediaServer.getSdpIp()); j9101.setRate(1); j9101.setTcpPort(ssrcInfo.getPort()); diff --git a/web_src/src/components/JTDeviceList.vue b/web_src/src/components/JTDeviceList.vue index 540cb5856..3bf3e61fc 100755 --- a/web_src/src/components/JTDeviceList.vue +++ b/web_src/src/components/JTDeviceList.vue @@ -222,7 +222,7 @@ export default { if (command === "params") { this.$router.push(`/jtDeviceParams/${itemData.phoneNumber}`); }else if (command === "connection") { - this.queryCloudRecords(itemData) + // this.queryCloudRecords(itemData) }else { this.$message.info("尚不支持"); } diff --git a/web_src/src/router/index.js b/web_src/src/router/index.js index c5ee8a834..3c4aca941 100755 --- a/web_src/src/router/index.js +++ b/web_src/src/router/index.js @@ -73,10 +73,6 @@ export default new VueRouter({ path: '/jtChannelList/:deviceId', component: jtChannelList, }, - { - path: '/pushVideoList', - component: pushVideoList, - }, { path: '/streamProxyList', component: streamProxyList, @@ -116,11 +112,6 @@ export default new VueRouter({ name: 'jtChannelEditAdd', component: jtChannelEdit, }, - { - path: '/parentPlatformList/:count/:page', - name: 'parentPlatformList', - component: parentPlatformList, - }, { path: '/map/:deviceId/:parentChannelId/:count/:page', name: 'map', diff --git a/数据库/2.7.3/初始化-mysql-2.7.3.sql b/数据库/2.7.3/初始化-mysql-2.7.3.sql index d572843dd..3b5462ac7 100644 --- a/数据库/2.7.3/初始化-mysql-2.7.3.sql +++ b/数据库/2.7.3/初始化-mysql-2.7.3.sql @@ -149,10 +149,12 @@ create table wvp_device_channel gb_svc_time_support_mode integer, stream_push_id integer, stream_proxy_id integer, + jt_channel_id integer, constraint uk_wvp_device_channel_unique_device_channel unique (device_db_id, device_id), constraint uk_wvp_unique_channel unique (gb_device_id), constraint uk_wvp_unique_stream_push_id unique (stream_push_id), - constraint uk_wvp_unique_stream_proxy_id unique (stream_proxy_id) + constraint uk_wvp_unique_stream_proxy_id unique (stream_proxy_id), + constraint uk_wvp_unique_jt_channel_id unique (jt_channel_id) ); create index uk_wvp_device_db_id on wvp_device_channel (device_db_id); @@ -427,3 +429,36 @@ CREATE TABLE wvp_common_region constraint uk_common_region_device_id unique (device_id) ); +create table wvp_jt_terminal ( + id serial primary key, + phone_number character varying(50), + terminal_id character varying(50), + province_id character varying(50), + province_text character varying(100), + city_id character varying(50), + city_text character varying(100), + maker_id character varying(50), + 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, + register_time character varying(50) default null, + update_time character varying(50) not null, + create_time character varying(50) not null, + constraint uk_jt_device_id_device_id unique (id, phone_number) +); + +create table wvp_jt_channel ( + id serial primary key, + terminal_db_id integer, + channel_id integer, + has_audio bool default false, + name character varying(255), + update_time character varying(50) not null, + create_time character varying(50) not null, + constraint uk_jt_device_id_device_id unique (terminal_db_id, channel_id) +); + diff --git a/数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql b/数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql index cb06d2eea..9d02f86b1 100644 --- a/数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql +++ b/数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql @@ -165,10 +165,12 @@ create table wvp_device_channel gb_svc_time_support_mode integer, stream_push_id integer, stream_proxy_id integer, + jt_channel_id integer, constraint uk_wvp_device_channel_unique_device_channel unique (device_db_id, device_id), constraint uk_wvp_unique_channel unique (gb_device_id), constraint uk_wvp_unique_stream_push_id unique (stream_push_id), - constraint uk_wvp_unique_stream_proxy_id unique (stream_proxy_id) + constraint uk_wvp_unique_stream_proxy_id unique (stream_proxy_id), + constraint uk_wvp_unique_jt_channel_id unique (jt_channel_id) ); create index uk_wvp_device_db_id on wvp_device_channel (device_db_id); @@ -444,3 +446,36 @@ CREATE TABLE wvp_common_region constraint uk_common_region_device_id unique (device_id) ); +create table wvp_jt_terminal ( + id serial primary key, + phone_number character varying(50), + terminal_id character varying(50), + province_id character varying(50), + province_text character varying(100), + city_id character varying(50), + city_text character varying(100), + maker_id character varying(50), + 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, + register_time character varying(50) default null, + update_time character varying(50) not null, + create_time character varying(50) not null, + constraint uk_jt_device_id_device_id unique (id, phone_number) +); + +create table wvp_jt_channel ( + id serial primary key, + terminal_db_id integer, + channel_id integer, + has_audio bool default false, + name character varying(255), + update_time character varying(50) not null, + create_time character varying(50) not null, + constraint uk_jt_device_id_device_id unique (terminal_db_id, channel_id) +); + diff --git a/数据库/JT1078-2.7.2/初始化-mysql-2.7.2.sql b/数据库/JT1078-2.7.2/初始化-mysql-2.7.2.sql index 65ad44cb4..98d434042 100644 --- a/数据库/JT1078-2.7.2/初始化-mysql-2.7.2.sql +++ b/数据库/JT1078-2.7.2/初始化-mysql-2.7.2.sql @@ -333,38 +333,7 @@ create table wvp_user_api_key ( update_time character varying(50) ); -create table wvp_jt_terminal ( - id serial primary key, - phone_number character varying(50), - terminal_id character varying(50), - province_id character varying(50), - province_text character varying(100), - city_id character varying(50), - city_text character varying(100), - maker_id character varying(50), - 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, - register_time character varying(50) default null, - update_time character varying(50) not null, - create_time character varying(50) not null, - constraint uk_jt_device_id_device_id unique (id, phone_number) -); -create table wvp_jt_channel ( - id serial primary key, - terminal_db_id integer, - channel_id integer, - has_audio bool default false, - name character varying(255), - update_time character varying(50) not null, - create_time character varying(50) not null, - constraint uk_jt_device_id_device_id unique (terminal_db_id, channel_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');