From c21d973977a9f1d00d26179de764687ddd0ec56c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 24 四月 2024 14:59:41 +0800
Subject: [PATCH] 修复收到catalog消息是更新导致是否有音频的设置失效的BUG
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
index 5e67372..e65a579 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
@@ -1,12 +1,17 @@
package com.genersoft.iot.vmp.vmanager.gb28181.gbStream;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.service.IGbStreamService;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.service.IPlatformService;
+import com.genersoft.iot.vmp.service.IStreamPushService;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.gb28181.gbStream.bean.GbStreamParam;
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,7 +33,10 @@
private IGbStreamService gbStreamService;
@Autowired
- private IVideoManagerStorage storager;
+ private IStreamPushService service;
+
+ @Autowired
+ private IPlatformService platformService;
/**
@@ -38,7 +46,7 @@
* @param platformId 骞冲彴ID
* @return
*/
- @Operation(summary = "鏌ヨ鍥芥爣閫氶亾")
+ @Operation(summary = "鏌ヨ鍥芥爣閫氶亾", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "page", description = "褰撳墠椤�", required = true)
@Parameter(name = "count", description = "姣忛〉鏉℃暟", required = true)
@Parameter(name = "platformId", description = "骞冲彴ID", required = true)
@@ -74,12 +82,12 @@
* @param gbStreamParam
* @return
*/
- @Operation(summary = "绉婚櫎鍥芥爣鍏宠仈")
+ @Operation(summary = "绉婚櫎鍥芥爣鍏宠仈", security = @SecurityRequirement(name = JwtUtils.HEADER))
@DeleteMapping(value = "/del")
@ResponseBody
public void del(@RequestBody GbStreamParam gbStreamParam){
- if (gbStreamParam.getGbStreams() == null || gbStreamParam.getGbStreams().size() == 0) {
+ if (gbStreamParam.getGbStreams() == null || gbStreamParam.getGbStreams().isEmpty()) {
if (gbStreamParam.isAll()) {
gbStreamService.delAllPlatformInfo(gbStreamParam.getPlatformId(), gbStreamParam.getCatalogId());
}
@@ -94,11 +102,11 @@
* @param gbStreamParam
* @return
*/
- @Operation(summary = "淇濆瓨鍥芥爣鍏宠仈")
+ @Operation(summary = "淇濆瓨鍥芥爣鍏宠仈", security = @SecurityRequirement(name = JwtUtils.HEADER))
@PostMapping(value = "/add")
@ResponseBody
public void add(@RequestBody GbStreamParam gbStreamParam){
- if (gbStreamParam.getGbStreams() == null || gbStreamParam.getGbStreams().size() == 0) {
+ if (gbStreamParam.getGbStreams() == null || gbStreamParam.getGbStreams().isEmpty()) {
if (gbStreamParam.isAll()) {
List<GbStream> allGBChannels = gbStreamService.getAllGBChannels(gbStreamParam.getPlatformId());
gbStreamService.addPlatformInfo(allGBChannels, gbStreamParam.getPlatformId(), gbStreamParam.getCatalogId());
@@ -107,4 +115,20 @@
gbStreamService.addPlatformInfo(gbStreamParam.getGbStreams(), gbStreamParam.getPlatformId(), gbStreamParam.getCatalogId());
}
}
+
+ /**
+ * 淇濆瓨鍥芥爣鍏宠仈
+ * @param gbId
+ * @return
+ */
+ @Operation(summary = "淇濆瓨鍥芥爣鍏宠仈", security = @SecurityRequirement(name = JwtUtils.HEADER))
+ @GetMapping(value = "/addWithGbid")
+ @ResponseBody
+ public void add(String gbId, String platformGbId, @RequestParam(required = false) String catalogGbId){
+ List<GbStream> gbStreams = gbStreamService.getGbChannelWithGbid(gbId);
+ if (gbStreams.isEmpty()) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "gbId鐨勪俊鎭湭鎵惧埌");
+ }
+ gbStreamService.addPlatformInfo(gbStreams, platformGbId, catalogGbId);
+ }
}
--
Gitblit v1.8.0