From 0020402685c0997c0a73bc7ac90535e50e8f972a Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: Fri, 8 Jan 2021 11:02:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=91=E4=B8=8A=E7=BA=A7?=
 =?UTF-8?q?=E8=81=94->=E9=80=89=E6=8B=A9=E9=80=9A=E9=81=93-001?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/genersoft/iot/vmp/conf/SipConfig.java | 29 ++++---------------
 .../storager/dao/ParentPlatformMapper.java    |  1 -
 web_src/src/components/ParentPlatformList.vue | 15 ++++++----
 web_src/src/components/channelList.vue        |  2 ++
 4 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
index 52d80890..b88778e3 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -8,15 +8,15 @@ import org.springframework.context.annotation.Configuration;
 public class SipConfig {
 
 	@Value("${sip.ip}")
-	String sipIp;
+	private String sipIp;
 	@Value("${sip.port}")
-	Integer sipPort;
+	private Integer sipPort;
 	@Value("${sip.domain}")
-	String sipDomain;
+	private String sipDomain;
 	@Value("${sip.id}")
-	String sipId;
+	private String sipId;
 	@Value("${sip.password}")
-	String sipPassword;
+	private String sipPassword;
 	
 	@Value("${sip.ptz.speed:50}")
 	Integer speed;
@@ -25,47 +25,28 @@ public class SipConfig {
 		return sipIp;
 	}
 
-	public void setSipIp(String sipIp) {
-		this.sipIp = sipIp;
-	}
 
 	public Integer getSipPort() {
 		return sipPort;
 	}
 
-	public void setSipPort(Integer sipPort) {
-		this.sipPort = sipPort;
-	}
 
 	public String getSipDomain() {
 		return sipDomain;
 	}
 
-	public void setSipDomain(String sipDomain) {
-		this.sipDomain = sipDomain;
-	}
 
 	public String getSipId() {
 		return sipId;
 	}
 
-	public void setSipId(String sipId) {
-		this.sipId = sipId;
-	}
-
 	public String getSipPassword() {
 		return sipPassword;
 	}
 
-	public void setSipPassword(String sipPassword) {
-		this.sipPassword = sipPassword;
-	}
 
 	public Integer getSpeed() {
 		return speed;
 	}
 
-	public void setSpeed(Integer speed) {
-		this.speed = speed;
-	}
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
index efc74269..b0428cc5 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
@@ -45,7 +45,6 @@ public interface ParentPlatformMapper {
     @Delete("DELETE FROM parent_platform WHERE deviceGBId=#{deviceGBId}")
     int delParentPlatform(ParentPlatform parentPlatform);
 
-
     @Select("SELECT * FROM parent_platform")
     List<ParentPlatform> getParentPlatformList();
 
diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue
index 0d3ce699..39aeb3cb 100644
--- a/web_src/src/components/ParentPlatformList.vue
+++ b/web_src/src/components/ParentPlatformList.vue
@@ -39,9 +39,9 @@
             </template>
           </el-table-column>
           <el-table-column prop="deviceGBId" label="设备国标编号" width="240" align="center"></el-table-column>
-          <el-table-column prop="transport" label="流传输模式" width="120" align="center"></el-table-column>
+          <el-table-column prop="transport" label="信令传输模式" width="120" align="center"></el-table-column>
           <el-table-column prop="channelCount" label="通道数" align="center"></el-table-column>
-          
+
           <el-table-column label="操作" width="300" align="center" fixed="right">
             <template slot-scope="scope">
               <el-button size="mini" icon="el-icon-edit" @click="editPlatform(scope.row)">编辑</el-button>
@@ -61,6 +61,7 @@
           :total="total">
         </el-pagination>
       <platformEdit ref="platformEdit" ></platformEdit>
+      <chooseChannelDialog ref="chooseChannelDialog" ></chooseChannelDialog>
       </el-main>
     </el-container>
   </div>
@@ -69,11 +70,13 @@
 <script>
 import platformEdit from './platformEdit.vue'
 import uiHeader from './UiHeader.vue'
+import chooseChannelDialog from './gb28181/chooseChannel.vue'
 export default {
   name: 'app',
   components: {
     platformEdit,
-    uiHeader
+    uiHeader,
+    chooseChannelDialog
   },
   data() {
     return {
@@ -86,11 +89,13 @@ export default {
     };
   },
   computed: {
+    
     getcurrentDeviceChannels: function() {
-      
+       
     }
   },
   mounted() {
+     this.$refs.chooseChannelDialog.openDialog()
     this.initData();
     this.updateLooper = setInterval(this.initData, 10000);
   },
@@ -133,7 +138,7 @@ export default {
             });
     },
     chooseChannel: function(platform) {
-
+       this.$refs.chooseChannelDialog.openDialog()
     },
     initData: function() {
       this.getPlatformList();
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index e221974b..fd52e040 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -31,6 +31,8 @@
             <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" border style="width: 100%">
                 <el-table-column prop="channelId" label="通道编号" width="210">
                 </el-table-column>
+                <el-table-column prop="channelId" label="设备编号" width="210">
+                </el-table-column>
                 <el-table-column prop="name" label="通道名称">
                 </el-table-column>
                 <el-table-column prop="subCount" label="子节点数">