diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java index 29d65807..5156c42a 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java @@ -367,7 +367,7 @@ public class GbChannelServiceImpl implements IGbChannelService { log.warn("[重置国标通道] 未找到对应Id的通道: id: {}", id); throw new ControllerException(ErrorCode.ERROR400); } - if (channel.getDataType() == ChannelDataType.GB28181.value) { + if (channel.getDataType() != ChannelDataType.GB28181.value) { log.warn("[重置国标通道] 非国标下级通道无法重置: id: {}", id); throw new ControllerException(ErrorCode.ERROR100.getCode(), "非国标下级通道无法重置"); } diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java b/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java index 8c3758ae..ce28fa9b 100755 --- a/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java @@ -50,7 +50,7 @@ public interface StreamPushMapper { " LEFT join wvp_device_channel wdc " + " on st.id = wdc.data_device_id " + " WHERE " + - " 1=1 " + + " wdc.data_type = 2 " + " AND (st.app LIKE concat('%',#{query},'%') escape '/' OR st.stream LIKE concat('%',#{query},'%') escape '/' " + " OR wdc.gb_device_id LIKE concat('%',#{query},'%') escape '/' OR wdc.gb_name LIKE concat('%',#{query},'%') escape '/') " + " AND st.pushing=1" + diff --git a/web_src/src/components/StreamProxyEdit.vue b/web_src/src/components/StreamProxyEdit.vue index 12413bfc..b4596941 100644 --- a/web_src/src/components/StreamProxyEdit.vue +++ b/web_src/src/components/StreamProxyEdit.vue @@ -153,7 +153,6 @@ export default { onSubmit: function () { console.log(typeof this.streamProxy.noneReader) this.saveLoading = true; - this.noneReaderHandler(); if (this.streamProxy.id) { this.$axios({ diff --git a/web_src/src/components/StreamProxyList.vue b/web_src/src/components/StreamProxyList.vue index 43eacaae..81b7008d 100755 --- a/web_src/src/components/StreamProxyList.vue +++ b/web_src/src/components/StreamProxyList.vue @@ -204,6 +204,7 @@ // this.$refs.streamProxyEdit.openDialog(null, this.initData) this.streamProxy = { type: "default", + dataType: 3, noneReader: 1, enable: true, enableAudio: true, diff --git a/web_src/src/components/common/channelDataTypeSelect.vue b/web_src/src/components/common/channelDataTypeSelect.vue deleted file mode 100644 index 5e3be93c..00000000 --- a/web_src/src/components/common/channelDataTypeSelect.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - diff --git a/web_src/src/components/dialog/GbChannelSelect.vue b/web_src/src/components/dialog/GbChannelSelect.vue index 5d3fa934..1bc92cd2 100644 --- a/web_src/src/components/dialog/GbChannelSelect.vue +++ b/web_src/src/components/dialog/GbChannelSelect.vue @@ -23,7 +23,13 @@ 类型: - + + + + + + 刷新 确 定 @@ -80,11 +86,9 @@