XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除自定义的是否支持云台属性

Browse Source
This commit is contained in:
lin
2025-09-26 17:31:37 +08:00
parent 8d6fe0c9d8
commit 4280a1d08e
12 changed files with 84 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java
View File

@@ -153,9 +153,6 @@ public class CommonGBChannel {
@Schema(description = "流唯一编号，存在表示正在直播")
private String streamId;
@Schema(description = "是否支持云台控制 1支持,0不支持")
private Integer enablePtz;
@Schema(description = "是否支持对讲 1支持,0不支持")
private Integer enableBroadcast;
@@ -346,9 +343,6 @@ public class CommonGBChannel {
if (this.getGbSvcTimeSupportMode() != null) {
content.append(" <SVCTimeSupportMode>" + this.getGbSvcTimeSupportMode() + "</SVCTimeSupportMode>\n");
}
if (this.getEnablePtz() != null) {
content.append(" <EnablePtz>" + this.getEnablePtz() + "</EnablePtz>\n");
}
if (this.getEnableBroadcast() != null) {
content.append(" <EnableBroadcast>" + this.getEnableBroadcast() + "</EnableBroadcast>\n");
}

7
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
View File

@@ -237,13 +237,6 @@ public class DeviceChannel extends CommonGBChannel {
deviceChannel.setHasAudio(true);
if (deviceChannel.getEnableBroadcast() == null && "138".equals(gbCode.getTypeCode())) {
deviceChannel.setEnableBroadcast(1);
}
if (deviceChannel.getEnablePtz() == null && (
deviceChannel.getPtzType() == 1
|| deviceChannel.getPtzType() == 4
|| deviceChannel.getPtzType() == 5
)) {
deviceChannel.setEnablePtz(1);
}
}

8
src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
View File

@@ -58,7 +58,6 @@ public interface CommonGBChannelMapper {
"gb_download_speed," +
"gb_svc_space_support_mod," +
"gb_svc_time_support_mode," +
"enable_ptz," +
"enable_broadcast ) " +
"VALUES (" +
"#{gbDeviceId}, " +
@@ -99,7 +98,6 @@ public interface CommonGBChannelMapper {
"#{gbDownloadSpeed},"+
"#{gbSvcSpaceSupportMod},"+
"#{gbSvcTimeSupportMode},"+
"#{enablePtz},"+
"#{enableBroadcast}"+
")" +
" </script>")
@@ -148,7 +146,6 @@ public interface CommonGBChannelMapper {
", gb_download_speed = #{gbDownloadSpeed}" +
", gb_svc_space_support_mod = #{gbSvcSpaceSupportMod}" +
", gb_svc_time_support_mode = #{gbSvcTimeSupportMode}" +
", enable_ptz = #{enablePtz}" +
", enable_broadcast = #{enableBroadcast}" +
" WHERE id = #{gbId}"+
" </script>"})
@@ -212,7 +209,6 @@ public interface CommonGBChannelMapper {
"gb_download_speed," +
"gb_svc_space_support_mod," +
"gb_svc_time_support_mode," +
"enable_ptz," +
"enable_broadcast ) " +
"VALUES" +
"<foreach collection='commonGBChannels' index='index' item='item' separator=','> " +
@@ -222,7 +218,7 @@ public interface CommonGBChannelMapper {
"#{item.gbRegisterWay},#{item.gbCertNum},#{item.gbCertifiable},#{item.gbErrCode},#{item.gbEndTime}, #{item.gbSecrecy},#{item.gbIpAddress}," +
"#{item.gbPort},#{item.gbPassword},#{item.gbStatus},#{item.gbLongitude}, #{item.gbLatitude},#{item.gbPtzType},#{item.gbPositionType},#{item.gbRoomType}," +
"#{item.gbUseType},#{item.gbSupplyLightType},#{item.gbDirectionType},#{item.gbResolution},#{item.gbBusinessGroupId},#{item.gbDownloadSpeed}," +
"#{item.gbSvcSpaceSupportMod},#{item.gbSvcTimeSupportMode},#{item.enablePtz},#{item.enableBroadcast})" +
"#{item.gbSvcSpaceSupportMod},#{item.gbSvcTimeSupportMode},#{item.enableBroadcast})" +
"</foreach> " +
" </script>")
int batchAdd(List<CommonGBChannel> commonGBChannels);
@@ -432,7 +428,6 @@ public interface CommonGBChannelMapper {
", gb_download_speed=#{item.gbDownloadSpeed}" +
", gb_svc_space_support_mod=#{item.gbSvcSpaceSupportMod}" +
", gb_svc_time_support_mode=#{item.gbSvcTimeSupportMode}" +
", enable_ptz = #{enablePtz}" +
", enable_broadcast = #{enableBroadcast}" +
" WHERE id=#{item.gbId}" +
"</foreach>" +
@@ -515,7 +510,6 @@ public interface CommonGBChannelMapper {
" wdc.create_time,\n" +
" wdc.update_time,\n" +
" wdc.record_plan_id,\n" +
" wdc.enable_ptz,\n" +
" wdc.enable_broadcast,\n" +
" coalesce( wdc.gb_device_id, wdc.device_id) as gb_device_id,\n" +
" coalesce( wdc.gb_name, wdc.name) as gb_name,\n" +

3
src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
View File

@@ -18,7 +18,6 @@ public class ChannelProvider {
" update_time,\n" +
" stream_id,\n" +
" record_plan_id,\n" +
" enable_ptz,\n" +
" enable_broadcast,\n" +
" coalesce(gb_device_id, device_id) as gb_device_id,\n" +
" coalesce(gb_name, name) as gb_name,\n" +
@@ -65,7 +64,6 @@ public class ChannelProvider {
" wdc.update_time,\n" +
" wdc.stream_id,\n" +
" wdc.record_plan_id,\n" +
" wdc.enable_ptz,\n" +
" wdc.enable_broadcast,\n" +
" coalesce(wdc.gb_device_id, wdc.device_id) as gb_device_id,\n" +
" coalesce(wdc.gb_name, wdc.name) as gb_name,\n" +
@@ -111,7 +109,6 @@ public class ChannelProvider {
" wdc.data_device_id,\n" +
" wdc.create_time,\n" +
" wdc.update_time,\n" +
" wdc.enable_ptz,\n" +
" wdc.enable_broadcast,\n" +
" coalesce(wpgc.custom_device_id, wdc.gb_device_id, wdc.device_id) as gb_device_id,\n" +
" coalesce(wpgc.custom_name, wdc.gb_name, wdc.name) as gb_name,\n" +

9
src/main/java/com/genersoft/iot/vmp/streamPush/bean/RedisPushStreamMessage.java
View File

@@ -14,6 +14,12 @@ public class RedisPushStreamMessage {
private String groupGbId;
// 终端所属的虚拟组织别名 可选，可作为地方同步组织结构到wvp时的关联关系
private String groupAlias;
// 生产商
private String manufacturer;
// 设备型号
private String model;
// 摄像机类型
private Integer ptzType;
public StreamPush buildstreamPush() {
StreamPush push = new StreamPush();
@@ -22,6 +28,9 @@ public class RedisPushStreamMessage {
push.setGbName(name);
push.setGbDeviceId(gbId);
push.setStartOfflinePush(true);
push.setGbManufacturer(manufacturer);
push.setGbModel(model);
push.setGbPtzType(ptzType);
push.setGbStatus(status?"ON":"OFF");
return push;
}

12
src/main/java/com/genersoft/iot/vmp/web/custom/ChannelController.java Normal file
View File

@@ -0,0 +1,12 @@
package com.genersoft.iot.vmp.web.custom;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController
@RequestMapping(value = "/api/sy")
public class ChannelController {
}

3
web/src/views/common/CommonChannelEdit.vue
View File

@@ -204,7 +204,6 @@
</el-select>
</el-form-item>
<el-form-item >
<el-checkbox v-model="form.enablePtzForBool" >云台控制(非标属性)</el-checkbox>
<el-checkbox v-model="form.enableBroadcastForBool" >语音对讲(非标属性)</el-checkbox>
</el-form-item>
@@ -259,7 +258,6 @@ export default {
if (this.form.gbDownloadSpeedArray) {
this.form.gbDownloadSpeed = this.form.gbDownloadSpeedArray.join('/')
}
this.form.enablePtz = this.form.enablePtzForBool ? 1 : 0
this.form.enableBroadcast = this.form.enableBroadcastForBool ? 1 : 0
if (this.form.gbId) {
this.$store.dispatch('commonChanel/update', this.form)
@@ -328,7 +326,6 @@ export default {
data.gbDownloadSpeedArray = data.gbDownloadSpeed.split('/')
}
this.form = data
this.$set(this.form, 'enablePtzForBool', this.form.enablePtz === 1)
this.$set(this.form, 'enableBroadcastForBool', this.form.enableBroadcast === 1)
})
.finally(() => {

55
web/src/views/map/index.vue
View File

@@ -4,7 +4,7 @@
<DeviceTree ref="deviceTree" @clickEvent="treeChannelClickEvent" :showPosition="true" :contextmenu="getContextmenu()"/>
<MapComponent ref="mapComponent" @loaded="initChannelLayer" @coordinateSystemChange="initChannelLayer"></MapComponent>
</div>
<div class="map-tool-box">
<div class="map-tool-box-bottom-right">
<div class="map-tool-btn-group">
<el-dropdown placement="top" @command="changeMapTile">
<div class="el-dropdown-link map-tool-btn">
@@ -29,7 +29,29 @@
<i class="iconfont icon-minus1"></i>
</div>
</div>
</div>
<div class="map-tool-box-top-left">
<div class="map-tool-btn-group">
<div class="map-tool-btn" title="图层抽稀">
<i class="iconfont icon-mti-sandian"></i> <span>图层抽稀</span>
</div>
<!-- <div class="map-tool-btn" title="位置编辑">-->
<!-- <i class="el-icon-edit"></i> <span>位置编辑</span>-->
<!-- </div>-->
</div>
</div>
<div class="map-tool-box-top-right">
<div class="map-tool-btn-group">
<div class="map-tool-btn" title="抽稀">
<i class="iconfont icon-mti-sandian"></i>
</div>
<div class="map-tool-btn" title="聚合">
<i class="iconfont icon-mti-jutai"></i>
</div>
<div class="map-tool-btn" title="默认">
<i class="iconfont icon-mti-jutai"></i>
</div>
</div>
</div>
<div ref="infobox">
<transition name="el-zoom-in-center">
@@ -370,11 +392,21 @@ export default {
</script>
<style>
.map-tool-box {
.map-tool-box-bottom-right {
position: absolute;
right: 20px;
bottom: 20px;
}
.map-tool-box-top-right {
position: absolute;
right: 20px;
top: 20px;
}
.map-tool-box-top-left {
position: absolute;
left: 380px;
top: 20px;
}
.map-tool-btn-group {
background-color: #FFFFFF;
border-radius: 3px;
@@ -382,9 +414,23 @@ export default {
box-shadow: 0 2px 2px rgba(0, 0, 0, .15);
margin-bottom: 10px;
}
.map-tool-box-top-left .map-tool-btn-group {
display: flex;
}
.map-tool-box-top-right .map-tool-btn-group {
display: flex;
}
.map-tool-box-top-left .map-tool-btn {
padding: 0 10px;
}
.map-tool-box-top-right .map-tool-btn {
padding: 0 10px;
}
.map-tool-btn {
border-bottom: 1px #dfdfdf solid;
width: 33px;
border-right: 1px #dfdfdf solid;
width: fit-content;
min-width: 33px;
height: 36px;
cursor: pointer;
text-align: center;
@@ -396,6 +442,7 @@ export default {
}
.map-tool-btn-group:last-child {
border-bottom: none;
border-right: none;
}
.infobox-content{

4
数据库/2.7.4/初始化-mysql-2.7.4.sql
View File

@@ -118,7 +118,8 @@ create table IF NOT EXISTS wvp_device_channel
has_audio bool default false,
gps_time character varying(50),
stream_identification character varying(50),
channel_type int default 0 not null,
channel_type int default 0 not null,
map_level int default 0,
gb_device_id character varying(50),
gb_name character varying(255),
gb_manufacturer character varying(255),
@@ -159,7 +160,6 @@ create table IF NOT EXISTS wvp_device_channel
gps_speed double precision,
gps_altitude double precision,
gps_direction double precision,
enable_ptz integer default 0,
enable_broadcast integer default 0,
index (data_type),
index (data_device_id),

4
数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql
View File

@@ -118,7 +118,8 @@ create table IF NOT EXISTS wvp_device_channel
has_audio bool default false,
gps_time character varying(50),
stream_identification character varying(50),
channel_type int default 0 not null,
channel_type int default 0 not null,
map_level int default 0,
gb_device_id character varying(50),
gb_name character varying(255),
gb_manufacturer character varying(255),
@@ -159,7 +160,6 @@ create table IF NOT EXISTS wvp_device_channel
gps_speed double precision,
gps_altitude double precision,
gps_direction double precision,
enable_ptz integer default 0,
enable_broadcast integer default 0,
constraint uk_wvp_unique_channel unique (gb_device_id)
);

12
数据库/2.7.4/更新-mysql-2.7.4.sql
View File

@@ -79,17 +79,17 @@ DELIMITER ;
DELIMITER // -- 重定义分隔符避免分号冲突
CREATE PROCEDURE `wvp_20250924`()
BEGIN
IF NOT EXISTS (SELECT column_name FROM information_schema.columns
WHERE TABLE_SCHEMA = (SELECT DATABASE()) and table_name = 'wvp_device_channel' and column_name = 'enable_ptz')
THEN
ALTER TABLE wvp_device_channel ADD enable_ptz integer default 0;
END IF;
IF NOT EXISTS (SELECT column_name FROM information_schema.columns
WHERE TABLE_SCHEMA = (SELECT DATABASE()) and table_name = 'wvp_device_channel' and column_name = 'enable_broadcast')
THEN
ALTER TABLE wvp_device_channel ADD enable_broadcast integer default 0;
END IF;
IF NOT EXISTS (SELECT column_name FROM information_schema.columns
WHERE TABLE_SCHEMA = (SELECT DATABASE()) and table_name = 'wvp_device_channel' and column_name = 'map_level')
THEN
ALTER TABLE wvp_device_channel ADD map_level integer default 0;
END IF;
END; //
call wvp_20250924();
DROP PROCEDURE wvp_20250924;

2
数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql
View File

@@ -39,4 +39,4 @@ ALTER table wvp_media_server ADD COLUMN IF NOT EXISTS mp4_port integer;
ALTER table wvp_media_server ADD COLUMN IF NOT EXISTS mp4_ssl_port integer;
ALTER table wvp_device_channel ADD COLUMN IF NOT EXISTS enable_broadcast integer default 0;
ALTER table wvp_device_channel ADD COLUMN IF NOT EXISTS enable_broadcast integer default 0;
ALTER table wvp_device_channel ADD COLUMN IF NOT EXISTS map_level integer default 0;