From ca16a79255f27709f88abc59bea362abdd1e2cc7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 07 五月 2022 09:52:02 +0800
Subject: [PATCH] 添加语音发送通道和语音接收通道字段
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 6 +++
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 18 +++++++++
web_src/src/components/dialog/deviceEdit.vue | 10 +++-
sql/mysql.sql | 2 +
src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java | 1
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 16 +++++++-
sql/update.sql | 13 +-----
7 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/sql/mysql.sql b/sql/mysql.sql
index cffaa69..4086d11 100644
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -44,6 +44,8 @@
`mobilePositionSubmissionInterval` int(11) NOT NULL DEFAULT '5',
`subscribeCycleForAlarm` int(11) NOT NULL,
`hostAddress` varchar(50) NOT NULL,
+ `audioChannelForReceive` varchar(50) NOT NULL,
+ `audioChannelForSend` varchar(50) NOT NULL,
`charset` varchar(50) NOT NULL,
`ssrcCheck` int(11) DEFAULT '0',
PRIMARY KEY (`id`),
diff --git a/sql/update.sql b/sql/update.sql
index 9c18c26..8bfe343 100644
--- a/sql/update.sql
+++ b/sql/update.sql
@@ -1,12 +1,5 @@
-alter table parent_platform
- add startOfflinePush int default 0 null;
-
-alter table parent_platform
- add administrativeDivision varchar(50) not null;
-
-alter table parent_platform
- add catalogGroup int default 1 null;
+alter table device
+ add audioChannelForReceive VARCHAR(50) null;
alter table device
- add ssrcCheck int default 0 null;
-
+ add audioChannelForSend VARCHAR(50) null;
\ No newline at end of file
diff --git a/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java b/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
index 3118587..8ff2efb 100644
--- a/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
+++ b/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
@@ -23,7 +23,6 @@
private static ConfigurableApplicationContext context;
public static void main(String[] args) {
VManageBootstrap.args = args;
- System.out.println("test");
VManageBootstrap.context = SpringApplication.run(VManageBootstrap.class, args);
}
// 椤圭洰閲嶅惎
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index 81b9666..778608e 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -134,6 +134,16 @@
*/
private boolean ssrcCheck;
+ /**
+ * 璁惧鐢ㄤ簬鎺ユ敹璇煶娑堟伅鐨勯�氶亾
+ */
+ private String audioChannelForReceive;
+
+ /**
+ * 璁惧鐢ㄤ簬鍙戦�佽闊虫秷鎭殑閫氶亾
+ */
+ private String audioChannelForSend;
+
public String getDeviceId() {
return deviceId;
@@ -334,4 +344,12 @@
public void setSsrcCheck(boolean ssrcCheck) {
this.ssrcCheck = ssrcCheck;
}
+
+ public String getAudioChannelForReceive() {
+ return audioChannelForReceive;
+ }
+
+ public void setAudioChannelForReceive(String audioChannelForReceive) {
+ this.audioChannelForReceive = audioChannelForReceive;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
index 97cf2cc..d1c942f 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
@@ -37,6 +37,8 @@
"subscribeCycleForMobilePosition," +
"mobilePositionSubmissionInterval," +
"subscribeCycleForAlarm," +
+ "audioChannelForReceive," +
+ "audioChannelForSend," +
"ssrcCheck," +
"online" +
") VALUES (" +
@@ -60,6 +62,8 @@
"#{subscribeCycleForMobilePosition}," +
"#{mobilePositionSubmissionInterval}," +
"#{subscribeCycleForAlarm}," +
+ "#{audioChannelForReceive}," +
+ "#{audioChannelForSend}," +
"#{ssrcCheck}," +
"#{online}" +
")")
@@ -86,6 +90,8 @@
"<if test=\"subscribeCycleForMobilePosition != null\">, subscribeCycleForMobilePosition=${subscribeCycleForMobilePosition}</if>" +
"<if test=\"mobilePositionSubmissionInterval != null\">, mobilePositionSubmissionInterval=${mobilePositionSubmissionInterval}</if>" +
"<if test=\"subscribeCycleForAlarm != null\">, subscribeCycleForAlarm=${subscribeCycleForAlarm}</if>" +
+ "<if test=\"audioChannelForReceive != null\">, audioChannelForReceive=#{audioChannelForReceive}</if>" +
+ "<if test=\"audioChannelForSend != null\">, audioChannelForSend=#{audioChannelForSend}</if>" +
"<if test=\"ssrcCheck != null\">, ssrcCheck=${ssrcCheck}</if>" +
"WHERE deviceId='${deviceId}'"+
" </script>"})
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index 20ffc00..dc88da0 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -251,20 +251,32 @@
@ApiOperation("璇煶骞挎挱鍛戒护")
@ApiImplicitParams({
@ApiImplicitParam(name = "deviceId", value = "璁惧Id", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "channelForSend", value = "璁惧鐢ㄤ簬鍙戦�佽闊虫暟鎹殑閫氶亾", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "channelForReceive", value = "璁惧鐢ㄤ簬鎺ユ敹璇煶鏁版嵁鐨勯�氶亾", dataTypeClass = String.class),
})
@GetMapping("/broadcast/{deviceId}")
@PostMapping("/broadcast/{deviceId}")
- public DeferredResult<ResponseEntity<String>> broadcastApi(@PathVariable String deviceId) {
+ public DeferredResult<ResponseEntity<String>> broadcastApi(@PathVariable String deviceId,
+ String channelForSend,
+ String channelForReceive) {
if (logger.isDebugEnabled()) {
logger.debug("璇煶骞挎挱API璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
+ DeferredResult<ResponseEntity<String>> result = new DeferredResult<>(3 * 1000L);
String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId;
if (resultHolder.exist(key, null)) {
result.setResult(new ResponseEntity<>("璁惧浣跨敤涓�",HttpStatus.OK));
return result;
}
+
+// playService.audioBroadcast(deviceId, channelForSend, channelForReceive);
+
+
+
+
+
+
String uuid = UUID.randomUUID().toString();
if (device == null) {
diff --git a/web_src/src/components/dialog/deviceEdit.vue b/web_src/src/components/dialog/deviceEdit.vue
index b4dd285..745a3e6 100644
--- a/web_src/src/components/dialog/deviceEdit.vue
+++ b/web_src/src/components/dialog/deviceEdit.vue
@@ -36,6 +36,12 @@
<el-option key="UTF-8" label="UTF-8" value="utf-8"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="璇煶鍙戦�侀�氶亾" prop="name">
+ <el-input v-model="form.audioChannelForSend" clearable></el-input>
+ </el-form-item>
+ <el-form-item label="璇煶鎺ユ敹閫侀�氶亾" prop="name">
+ <el-input v-model="form.audioChannelForReceive" clearable></el-input>
+ </el-form-item>
<el-form-item label="鐩綍璁㈤槄" title="0涓哄彇娑堣闃�" prop="subscribeCycleForCatalog" >
<el-input v-model="form.subscribeCycleForCatalog" clearable ></el-input>
</el-form-item>
@@ -99,8 +105,6 @@
})
},
onSubmit: function () {
- console.log("onSubmit");
- console.log(this.form);
this.form.subscribeCycleForCatalog = this.form.subscribeCycleForCatalog||0
this.form.subscribeCycleForMobilePosition = this.form.subscribeCycleForMobilePosition||0
this.form.mobilePositionSubmissionInterval = this.form.mobilePositionSubmissionInterval||0
@@ -120,7 +124,7 @@
});
}
}).catch(function (error) {
- console.log(error);
+ console.error(error);
});
},
close: function () {
--
Gitblit v1.8.0