From e886aa483373ccb85d964675b118ca9f0e27ee9c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 27 三月 2024 11:15:35 +0800
Subject: [PATCH] 修复PTZType导致声音开关失效的问题
---
web_src/src/components/common/DeviceTree.vue | 6 +++---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java | 8 ++++----
web_src/src/components/dialog/channelMapInfobox.vue | 2 +-
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java | 4 ++--
web_src/src/components/map.vue | 2 +-
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 10 +++++-----
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
index 43a5d48..32b6fac 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -447,16 +447,16 @@
this.password = password;
}
- public int getPTZType() {
+ public int getPtzType() {
return ptzType;
}
- public String getPTZTypeText() {
+ public String getPtzTypeText() {
return ptzTypeText;
}
- public void setPTZTypeText(String PTZTypeText) {
- this.ptzTypeText = PTZTypeText;
+ public void setPtzTypeText(String ptzTypeText) {
+ this.ptzTypeText = ptzTypeText;
}
public boolean isStatus() {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
index abd32fb..2964654 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
@@ -358,8 +358,8 @@
}else {
catalogXml.append("<Password></Password>\r\n");
}
- if (!ObjectUtils.isEmpty(channel.getPTZType())) {
- catalogXml.append("<PTZType>" + channel.getPTZType() + "</PTZType>\r\n");
+ if (!ObjectUtils.isEmpty(channel.getPtzType())) {
+ catalogXml.append("<PTZType>" + channel.getPtzType() + "</PTZType>\r\n");
}else {
catalogXml.append("<PTZType></PTZType>\r\n");
}
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
index e823c6e..c751b91 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -23,7 +23,7 @@
"longitude_wgs84, latitude_wgs84, has_audio, create_time, update_time, business_group_id, gps_time, stream_identification) " +
"VALUES (#{channelId}, #{deviceId}, #{name}, #{manufacture}, #{model}, #{owner}, #{civilCode}, #{block}," +
"#{address}, #{parental}, #{parentId}, #{safetyWay}, #{registerWay}, #{certNum}, #{certifiable}, #{errCode}, #{secrecy}, " +
- "#{ipAddress}, #{port}, #{password}, #{PTZType}, #{status}, #{streamId}, #{longitude}, #{latitude}, #{longitudeGcj02}, " +
+ "#{ipAddress}, #{port}, #{password}, #{ptzType}, #{status}, #{streamId}, #{longitude}, #{latitude}, #{longitudeGcj02}, " +
"#{latitudeGcj02}, #{longitudeWgs84}, #{latitudeWgs84}, #{hasAudio}, #{createTime}, #{updateTime}, #{businessGroupId}, #{gpsTime}, #{streamIdentification})")
int add(DeviceChannel channel);
@@ -48,7 +48,7 @@
"<if test='ipAddress != null'>, ip_address=#{ipAddress}</if>" +
"<if test='port != null'>, port=#{port}</if>" +
"<if test='password != null'>, password=#{password}</if>" +
- "<if test='PTZType != null'>, custom_ptz_type=#{PTZType}</if>" +
+ "<if test='ptzType != null'>, custom_ptz_type=#{ptzType}</if>" +
"<if test='status != null'>, status=#{status}</if>" +
"<if test='streamId != null'>, stream_id=#{streamId}</if>" +
"<if test='hasAudio != null'>, has_audio=#{hasAudio}</if>" +
@@ -250,7 +250,7 @@
"#{item.owner}, #{item.civilCode}, #{item.block},#{item.subCount}," +
"#{item.address}, #{item.parental}, #{item.parentId}, #{item.safetyWay}, #{item.registerWay}, " +
"#{item.certNum}, #{item.certifiable}, #{item.errCode}, #{item.secrecy}, " +
- "#{item.ipAddress}, #{item.port}, #{item.password}, #{item.PTZType}, #{item.status}, " +
+ "#{item.ipAddress}, #{item.port}, #{item.password}, #{item.ptzType}, #{item.status}, " +
"#{item.streamId}, #{item.longitude}, #{item.latitude},#{item.longitudeGcj02}, " +
"#{item.latitudeGcj02},#{item.longitudeWgs84}, #{item.latitudeWgs84}, #{item.hasAudio}, now(), now(), " +
"#{item.businessGroupId}, #{item.gpsTime}, #{item.streamIdentification}) " +
@@ -271,7 +271,7 @@
"#{item.owner}, #{item.civilCode}, #{item.block},#{item.subCount}," +
"#{item.address}, #{item.parental}, #{item.parentId}, #{item.safetyWay}, #{item.registerWay}, " +
"#{item.certNum}, #{item.certifiable}, #{item.errCode}, #{item.secrecy}, " +
- "#{item.ipAddress}, #{item.port}, #{item.password}, #{item.PTZType}, #{item.status}, " +
+ "#{item.ipAddress}, #{item.port}, #{item.password}, #{item.ptzType}, #{item.status}, " +
"#{item.streamId}, #{item.longitude}, #{item.latitude},#{item.longitudeGcj02}, " +
"#{item.latitudeGcj02},#{item.longitudeWgs84}, #{item.latitudeWgs84}, #{item.hasAudio}, now(), now(), " +
"#{item.businessGroupId}, #{item.gpsTime}) " +
@@ -339,7 +339,7 @@
"<if test='item.ipAddress != null'>, ip_address=#{item.ipAddress}</if>" +
"<if test='item.port != null'>, port=#{item.port}</if>" +
"<if test='item.password != null'>, password=#{item.password}</if>" +
- "<if test='item.PTZType != null'>, ptz_type=#{item.PTZType}</if>" +
+ "<if test='item.ptzType != null'>, ptz_type=#{item.ptzType}</if>" +
"<if test='item.status != null'>, status=#{item.status}</if>" +
"<if test='item.streamId != null'>, stream_id=#{item.streamId}</if>" +
"<if test='item.hasAudio != null'>, has_audio=#{item.hasAudio}</if>" +
diff --git a/web_src/src/components/common/DeviceTree.vue b/web_src/src/components/common/DeviceTree.vue
index c701bf0..6030dc8 100755
--- a/web_src/src/components/common/DeviceTree.vue
+++ b/web_src/src/components/common/DeviceTree.vue
@@ -131,11 +131,11 @@
type = 2;
}
console.log(type)
- if (item.basicData.ptztype === 1 ) { // 1-鐞冩満;2-鍗婄悆;3-鍥哄畾鏋満;4-閬ユ帶鏋満
+ if (item.basicData.ptzType === 1 ) { // 1-鐞冩満;2-鍗婄悆;3-鍥哄畾鏋満;4-閬ユ帶鏋満
type = 4;
- }else if (item.basicData.ptztype === 2) {
+ }else if (item.basicData.ptzType === 2) {
type = 5;
- }else if (item.basicData.ptztype === 3 || item.basicData.ptztype === 4) {
+ }else if (item.basicData.ptzType === 3 || item.basicData.ptzType === 4) {
type = 6;
}
}else {
diff --git a/web_src/src/components/dialog/channelMapInfobox.vue b/web_src/src/components/dialog/channelMapInfobox.vue
index 2ef0e52..fa7ae5c 100755
--- a/web_src/src/components/dialog/channelMapInfobox.vue
+++ b/web_src/src/components/dialog/channelMapInfobox.vue
@@ -7,7 +7,7 @@
<el-descriptions-item label="璁惧褰掑睘" >{{channel.owner}}</el-descriptions-item>
<el-descriptions-item label="琛屾斂鍖哄煙" >{{channel.civilCode}}</el-descriptions-item>
<el-descriptions-item label="瀹夎鍦板潃" >{{channel.address}}</el-descriptions-item>
- <el-descriptions-item label="浜戝彴绫诲瀷" >{{channel.ptztypeText}}</el-descriptions-item>
+ <el-descriptions-item label="浜戝彴绫诲瀷" >{{channel.ptzTypeText}}</el-descriptions-item>
<el-descriptions-item label="缁忕含搴�" >{{channel.longitude}},{{channel.latitude}}</el-descriptions-item>
<el-descriptions-item label="鐘舵��">
<el-tag size="small" v-if="channel.status === 1">鍦ㄧ嚎</el-tag>
diff --git a/web_src/src/components/map.vue b/web_src/src/components/map.vue
index 248426c..64ae0e2 100755
--- a/web_src/src/components/map.vue
+++ b/web_src/src/components/map.vue
@@ -243,7 +243,7 @@
},
getImageByChannel: function (channel) {
let src = "static/images/gis/camera.png"
- switch (channel.ptztype) {
+ switch (channel.ptzType) {
case 1:
if (channel.status === 1) {
src = "static/images/gis/camera1.png"
--
Gitblit v1.8.0