From 081bb6de18dc51a2ce52d1d471cc4bacca7113e7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Tue, 24 Dec 2024 23:35:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=80=9A=E9=81=93=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=9A=84=E4=BF=9D=E5=AD=98=E4=B8=8E?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GbChannelServiceImpl.java    |  2 +-
 .../vmp/streamPush/dao/StreamPushMapper.java  |  2 +-
 web_src/src/components/StreamProxyEdit.vue    |  1 -
 web_src/src/components/StreamProxyList.vue    |  1 +
 .../common/channelDataTypeSelect.vue          | 41 -------------------
 .../src/components/dialog/GbChannelSelect.vue | 10 +++--
 .../components/dialog/linkChannelRecord.vue   | 11 +++--
 .../src/components/dialog/shareChannelAdd.vue | 11 +++--
 web_src/src/components/group.vue              | 11 +++--
 web_src/src/components/region.vue             | 10 +++--
 10 files changed, 41 insertions(+), 59 deletions(-)
 delete mode 100644 web_src/src/components/common/channelDataTypeSelect.vue

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 " +
             " <if test='query != null'> 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 '/')</if> " +
             " <if test='pushing == true' > AND st.pushing=1</if>" +
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 @@
-<template>
-  <el-select size="mini"  @change="change" v-model="dataType" placeholder="请选择"
-             default-first-option>
-    <el-option label="全部" value=""></el-option>
-    <el-option
-      v-for="item in dataTypeArray"
-      :key="item.key"
-      :label="item.key"
-      :value="item.value">
-    </el-option>
-  </el-select>
-</template>
-
-<script>
-
-export default {
-  name: "channelDataTypeSelect",
-  props: ['dataType','change'],
-  created() {
-    this.init()
-  },
-  data() {
-    return {
-      dataTypeArray: [],
-    };
-  },
-  methods: {
-    init: function (){
-      this.$axios({
-        method: 'get',
-        url: `/api/server/channel/datatype`,
-        params: {}
-      }).then((res)=> {
-        if (res.data.code === 0) {
-          this.dataTypeArray = res.data.data;
-        }
-      })
-    },
-  },
-};
-</script>
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 @@
             <el-option label="离线" value="false"></el-option>
           </el-select>
           类型:
-          <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" :change="getChannelList" :dataType="channelType"></channelDataTypeSelect>
+          <el-select size="mini" style="width: 8rem; margin-right: 1rem;" @change="getChannelList" v-model="channelType" placeholder="请选择"
+                     default-first-option>
+            <el-option label="全部" value=""></el-option>
+            <el-option label="国标设备" :value="1"></el-option>
+            <el-option label="推流设备" :value="2"></el-option>
+            <el-option label="拉流代理" :value="3"></el-option>
+          </el-select>
           <el-button size="mini" :loading="getChannelListLoading"
                      @click="getChannelList()">刷新</el-button>
           <el-button type="primary" size="mini" style="float: right" @click="onSubmit">确 定</el-button>
@@ -80,11 +86,9 @@
 
 <script>
 
-import ChannelDataTypeSelect from "../common/channelDataTypeSelect.vue";
 
 export default {
   name: "gbChannelSelect",
-  components: {ChannelDataTypeSelect},
   props: ['dataType', "selected"],
   computed: {},
   data() {
diff --git a/web_src/src/components/dialog/linkChannelRecord.vue b/web_src/src/components/dialog/linkChannelRecord.vue
index 1568a579..2f5834bd 100755
--- a/web_src/src/components/dialog/linkChannelRecord.vue
+++ b/web_src/src/components/dialog/linkChannelRecord.vue
@@ -22,7 +22,13 @@
                   <el-option label="离线" value="false"></el-option>
                 </el-select>
                 类型:
-                <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" :change="search" :dataType="channelType"></channelDataTypeSelect>
+                <el-select size="mini" style="width: 8rem; margin-right: 1rem;" @change="search" v-model="channelType" placeholder="请选择"
+                           default-first-option>
+                  <el-option label="全部" value=""></el-option>
+                  <el-option label="国标设备" :value="1"></el-option>
+                  <el-option label="推流设备" :value="2"></el-option>
+                  <el-option label="拉流代理" :value="3"></el-option>
+                </el-select>
                 <el-button v-if="hasLink !=='true'" size="mini" type="primary" @click="add()">
                   添加
                 </el-button>
@@ -85,11 +91,10 @@
 <script>
 
 import gbDeviceSelect from "./GbDeviceSelect.vue";
-import ChannelDataTypeSelect from "../common/channelDataTypeSelect.vue";
 
 export default {
   name: 'linkChannelRecord',
-  components: {ChannelDataTypeSelect, gbDeviceSelect},
+  components: {gbDeviceSelect},
   data() {
     return {
       dialogLoading: false,
diff --git a/web_src/src/components/dialog/shareChannelAdd.vue b/web_src/src/components/dialog/shareChannelAdd.vue
index 574d33b4..b6a3429c 100755
--- a/web_src/src/components/dialog/shareChannelAdd.vue
+++ b/web_src/src/components/dialog/shareChannelAdd.vue
@@ -20,7 +20,13 @@
               <el-option label="离线" value="false"></el-option>
             </el-select>
             类型:
-            <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" :change="search" :dataType="channelType"></channelDataTypeSelect>
+            <el-select size="mini" style="width: 8rem; margin-right: 1rem;" @change="search" v-model="channelType" placeholder="请选择"
+                       default-first-option>
+              <el-option label="全部" value=""></el-option>
+              <el-option label="国标设备" :value="1"></el-option>
+              <el-option label="推流设备" :value="2"></el-option>
+              <el-option label="拉流代理" :value="3"></el-option>
+            </el-select>
             <el-button v-if="hasShare !=='true'" size="mini" type="primary" @click="add()">
               添加
             </el-button>
@@ -101,11 +107,10 @@
 <script>
 
 import gbDeviceSelect from "./GbDeviceSelect.vue";
-import ChannelDataTypeSelect from "../common/channelDataTypeSelect.vue";
 
 export default {
   name: 'shareChannelAdd',
-  components: {ChannelDataTypeSelect, gbDeviceSelect},
+  components: {gbDeviceSelect},
   props: [ 'platformId'],
   data() {
     return {
diff --git a/web_src/src/components/group.vue b/web_src/src/components/group.vue
index 8ca43391..e02cf305 100755
--- a/web_src/src/components/group.vue
+++ b/web_src/src/components/group.vue
@@ -28,7 +28,14 @@
                 <el-option label="离线" value="false"></el-option>
               </el-select>
               类型:
-              <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" :change="getChannelList" :dataType="channelType"></channelDataTypeSelect>
+              <el-select size="mini" style="width: 8rem; margin-right: 1rem;" @change="getChannelList"
+                         v-model="channelType" placeholder="请选择"
+                         default-first-option>
+                <el-option label="全部" value=""></el-option>
+                <el-option label="国标设备" :value="1"></el-option>
+                <el-option label="推流设备" :value="2"></el-option>
+                <el-option label="拉流代理" :value="3"></el-option>
+              </el-select>
               <el-button size="mini" type="primary" @click="add()">
                 添加通道
               </el-button>
@@ -90,12 +97,10 @@ import DeviceService from "./service/DeviceService";
 import GroupTree from "./common/GroupTree.vue";
 import GbChannelSelect from "./dialog/GbChannelSelect.vue";
 import RegionTree from "./common/RegionTree.vue";
-import ChannelDataTypeSelect from "./common/channelDataTypeSelect.vue";
 
 export default {
   name: 'channelList',
   components: {
-    ChannelDataTypeSelect,
     RegionTree,
     GbChannelSelect,
     uiHeader,
diff --git a/web_src/src/components/region.vue b/web_src/src/components/region.vue
index 4bfe7c5a..7feaccfd 100755
--- a/web_src/src/components/region.vue
+++ b/web_src/src/components/region.vue
@@ -28,7 +28,13 @@
                 <el-option label="离线" value="false"></el-option>
               </el-select>
               类型:
-              <channelDataTypeSelect style="width: 8rem; margin-right: 1rem;" :change="getChannelList" :dataType="channelType"></channelDataTypeSelect>
+              <el-select size="mini" style="width: 8rem; margin-right: 1rem;" @change="getChannelList" v-model="channelType" placeholder="请选择"
+                         default-first-option>
+                <el-option label="全部" value=""></el-option>
+                <el-option label="国标设备" :value="1"></el-option>
+                <el-option label="推流设备" :value="2"></el-option>
+                <el-option label="拉流代理" :value="3"></el-option>
+              </el-select>
               <el-button size="mini" type="primary" @click="add()">
                 添加通道
               </el-button>
@@ -89,12 +95,10 @@ import uiHeader from '../layout/UiHeader.vue'
 import DeviceService from "./service/DeviceService";
 import RegionTree from "./common/RegionTree.vue";
 import GbChannelSelect from "./dialog/GbChannelSelect.vue";
-import ChannelDataTypeSelect from "./common/channelDataTypeSelect.vue";
 
 export default {
   name: 'channelList',
   components: {
-    ChannelDataTypeSelect,
     GbChannelSelect,
     uiHeader,
     RegionTree,