guzijian / wvp-GB28181-pro · Commits

Commit e886aa483373ccb85d964675b118ca9f0e27ee9c

Authored by 648540858
1 parent 1aa347bd

修复PTZType导致声音开关失效的问题

Inline Side-by-side
Showing 6 changed files with 16 additions and 16 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
  View file @e886aa4
... ... @@ -447,16 +447,16 @@ public class DeviceChannel {
447 447 this.password = password;
448 448 }
449 449  
450   - public int getPTZType() {
  450 + public int getPtzType() {
451 451 return ptzType;
452 452 }
453 453  
454   - public String getPTZTypeText() {
  454 + public String getPtzTypeText() {
455 455 return ptzTypeText;
456 456 }
457 457  
458   - public void setPTZTypeText(String PTZTypeText) {
459   - this.ptzTypeText = PTZTypeText;
  458 + public void setPtzTypeText(String ptzTypeText) {
  459 + this.ptzTypeText = ptzTypeText;
460 460 }
461 461  
462 462 public boolean isStatus() {
... ...
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
  View file @e886aa4
... ... @@ -358,8 +358,8 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
358 358 }else {
359 359 catalogXml.append("<Password></Password>\r\n");
360 360 }
361   - if (!ObjectUtils.isEmpty(channel.getPTZType())) {
362   - catalogXml.append("<PTZType>" + channel.getPTZType() + "</PTZType>\r\n");
  361 + if (!ObjectUtils.isEmpty(channel.getPtzType())) {
  362 + catalogXml.append("<PTZType>" + channel.getPtzType() + "</PTZType>\r\n");
363 363 }else {
364 364 catalogXml.append("<PTZType></PTZType>\r\n");
365 365 }
... ...
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
  View file @e886aa4
... ... @@ -23,7 +23,7 @@ public interface DeviceChannelMapper {
23 23 "longitude_wgs84, latitude_wgs84, has_audio, create_time, update_time, business_group_id, gps_time, stream_identification) " +
24 24 "VALUES (#{channelId}, #{deviceId}, #{name}, #{manufacture}, #{model}, #{owner}, #{civilCode}, #{block}," +
25 25 "#{address}, #{parental}, #{parentId}, #{safetyWay}, #{registerWay}, #{certNum}, #{certifiable}, #{errCode}, #{secrecy}, " +
26   - "#{ipAddress}, #{port}, #{password}, #{PTZType}, #{status}, #{streamId}, #{longitude}, #{latitude}, #{longitudeGcj02}, " +
  26 + "#{ipAddress}, #{port}, #{password}, #{ptzType}, #{status}, #{streamId}, #{longitude}, #{latitude}, #{longitudeGcj02}, " +
27 27 "#{latitudeGcj02}, #{longitudeWgs84}, #{latitudeWgs84}, #{hasAudio}, #{createTime}, #{updateTime}, #{businessGroupId}, #{gpsTime}, #{streamIdentification})")
28 28 int add(DeviceChannel channel);
29 29  
... ... @@ -48,7 +48,7 @@ public interface DeviceChannelMapper {
48 48 "<if test='ipAddress != null'>, ip_address=#{ipAddress}</if>" +
49 49 "<if test='port != null'>, port=#{port}</if>" +
50 50 "<if test='password != null'>, password=#{password}</if>" +
51   - "<if test='PTZType != null'>, custom_ptz_type=#{PTZType}</if>" +
  51 + "<if test='ptzType != null'>, custom_ptz_type=#{ptzType}</if>" +
52 52 "<if test='status != null'>, status=#{status}</if>" +
53 53 "<if test='streamId != null'>, stream_id=#{streamId}</if>" +
54 54 "<if test='hasAudio != null'>, has_audio=#{hasAudio}</if>" +
... ... @@ -250,7 +250,7 @@ public interface DeviceChannelMapper {
250 250 "#{item.owner}, #{item.civilCode}, #{item.block},#{item.subCount}," +
251 251 "#{item.address}, #{item.parental}, #{item.parentId}, #{item.safetyWay}, #{item.registerWay}, " +
252 252 "#{item.certNum}, #{item.certifiable}, #{item.errCode}, #{item.secrecy}, " +
253   - "#{item.ipAddress}, #{item.port}, #{item.password}, #{item.PTZType}, #{item.status}, " +
  253 + "#{item.ipAddress}, #{item.port}, #{item.password}, #{item.ptzType}, #{item.status}, " +
254 254 "#{item.streamId}, #{item.longitude}, #{item.latitude},#{item.longitudeGcj02}, " +
255 255 "#{item.latitudeGcj02},#{item.longitudeWgs84}, #{item.latitudeWgs84}, #{item.hasAudio}, now(), now(), " +
256 256 "#{item.businessGroupId}, #{item.gpsTime}, #{item.streamIdentification}) " +
... ... @@ -271,7 +271,7 @@ public interface DeviceChannelMapper {
271 271 "#{item.owner}, #{item.civilCode}, #{item.block},#{item.subCount}," +
272 272 "#{item.address}, #{item.parental}, #{item.parentId}, #{item.safetyWay}, #{item.registerWay}, " +
273 273 "#{item.certNum}, #{item.certifiable}, #{item.errCode}, #{item.secrecy}, " +
274   - "#{item.ipAddress}, #{item.port}, #{item.password}, #{item.PTZType}, #{item.status}, " +
  274 + "#{item.ipAddress}, #{item.port}, #{item.password}, #{item.ptzType}, #{item.status}, " +
275 275 "#{item.streamId}, #{item.longitude}, #{item.latitude},#{item.longitudeGcj02}, " +
276 276 "#{item.latitudeGcj02},#{item.longitudeWgs84}, #{item.latitudeWgs84}, #{item.hasAudio}, now(), now(), " +
277 277 "#{item.businessGroupId}, #{item.gpsTime}) " +
... ... @@ -339,7 +339,7 @@ public interface DeviceChannelMapper {
339 339 "<if test='item.ipAddress != null'>, ip_address=#{item.ipAddress}</if>" +
340 340 "<if test='item.port != null'>, port=#{item.port}</if>" +
341 341 "<if test='item.password != null'>, password=#{item.password}</if>" +
342   - "<if test='item.PTZType != null'>, ptz_type=#{item.PTZType}</if>" +
  342 + "<if test='item.ptzType != null'>, ptz_type=#{item.ptzType}</if>" +
343 343 "<if test='item.status != null'>, status=#{item.status}</if>" +
344 344 "<if test='item.streamId != null'>, stream_id=#{item.streamId}</if>" +
345 345 "<if test='item.hasAudio != null'>, has_audio=#{item.hasAudio}</if>" +
... ...
web_src/src/components/common/DeviceTree.vue
  View file @e886aa4
... ... @@ -131,11 +131,11 @@ export default {
131 131 type = 2;
132 132 }
133 133 console.log(type)
134   - if (item.basicData.ptztype === 1 ) { // 1-球机;2-半球;3-固定枪机;4-遥控枪机
  134 + if (item.basicData.ptzType === 1 ) { // 1-球机;2-半球;3-固定枪机;4-遥控枪机
135 135 type = 4;
136   - }else if (item.basicData.ptztype === 2) {
  136 + }else if (item.basicData.ptzType === 2) {
137 137 type = 5;
138   - }else if (item.basicData.ptztype === 3 || item.basicData.ptztype === 4) {
  138 + }else if (item.basicData.ptzType === 3 || item.basicData.ptzType === 4) {
139 139 type = 6;
140 140 }
141 141 }else {
... ...
web_src/src/components/dialog/channelMapInfobox.vue
  View file @e886aa4
... ... @@ -7,7 +7,7 @@
7 7 <el-descriptions-item label="设备归属" >{{channel.owner}}</el-descriptions-item>
8 8 <el-descriptions-item label="行政区域" >{{channel.civilCode}}</el-descriptions-item>
9 9 <el-descriptions-item label="安装地址" >{{channel.address}}</el-descriptions-item>
10   - <el-descriptions-item label="云台类型" >{{channel.ptztypeText}}</el-descriptions-item>
  10 + <el-descriptions-item label="云台类型" >{{channel.ptzTypeText}}</el-descriptions-item>
11 11 <el-descriptions-item label="经纬度" >{{channel.longitude}},{{channel.latitude}}</el-descriptions-item>
12 12 <el-descriptions-item label="状态">
13 13 <el-tag size="small" v-if="channel.status === 1">在线</el-tag>
... ...
web_src/src/components/map.vue
  View file @e886aa4
... ... @@ -243,7 +243,7 @@ export default {
243 243 },
244 244 getImageByChannel: function (channel) {
245 245 let src = "static/images/gis/camera.png"
246   - switch (channel.ptztype) {
  246 + switch (channel.ptzType) {
247 247 case 1:
248 248 if (channel.status === 1) {
249 249 src = "static/images/gis/camera1.png"
... ...