From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 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
old mode 100644
new mode 100755
index 3ba032a..3bdee76
--- 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,9 +1,13 @@
package com.genersoft.iot.vmp.vmanager.gb28181.gbStream;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import com.genersoft.iot.vmp.vmanager.gb28181.gbStream.bean.GbStreamParam;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.service.IGbStreamService;
+import com.genersoft.iot.vmp.service.IPlatformService;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+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;
@@ -12,11 +16,13 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.List;
+
@Tag(name = "瑙嗛娴佸叧鑱斿埌绾ц仈骞冲彴")
-@CrossOrigin
+
@RestController
@RequestMapping("/api/gbStream")
public class GbStreamController {
@@ -27,7 +33,7 @@
private IGbStreamService gbStreamService;
@Autowired
- private IVideoManagerStorage storager;
+ private IPlatformService platformService;
/**
@@ -76,11 +82,14 @@
@Operation(summary = "绉婚櫎鍥芥爣鍏宠仈")
@DeleteMapping(value = "/del")
@ResponseBody
- public Object del(@RequestBody GbStreamParam gbStreamParam){
- if (gbStreamService.delPlatformInfo(gbStreamParam.getPlatformId(), gbStreamParam.getGbStreams())) {
- return "success";
+ public void del(@RequestBody GbStreamParam gbStreamParam){
+
+ if (gbStreamParam.getGbStreams() == null || gbStreamParam.getGbStreams().size() == 0) {
+ if (gbStreamParam.isAll()) {
+ gbStreamService.delAllPlatformInfo(gbStreamParam.getPlatformId(), gbStreamParam.getCatalogId());
+ }
}else {
- return "fail";
+ gbStreamService.delPlatformInfo(gbStreamParam.getPlatformId(), gbStreamParam.getGbStreams());
}
}
@@ -93,11 +102,30 @@
@Operation(summary = "淇濆瓨鍥芥爣鍏宠仈")
@PostMapping(value = "/add")
@ResponseBody
- public Object add(@RequestBody GbStreamParam gbStreamParam){
- if (gbStreamService.addPlatformInfo(gbStreamParam.getGbStreams(), gbStreamParam.getPlatformId(), gbStreamParam.getCatalogId())) {
- return "success";
+ public void add(@RequestBody GbStreamParam gbStreamParam){
+ if (gbStreamParam.getGbStreams() == null || gbStreamParam.getGbStreams().size() == 0) {
+ if (gbStreamParam.isAll()) {
+ List<GbStream> allGBChannels = gbStreamService.getAllGBChannels(gbStreamParam.getPlatformId());
+ gbStreamService.addPlatformInfo(allGBChannels, gbStreamParam.getPlatformId(), gbStreamParam.getCatalogId());
+ }
}else {
- return "fail";
+ gbStreamService.addPlatformInfo(gbStreamParam.getGbStreams(), gbStreamParam.getPlatformId(), gbStreamParam.getCatalogId());
}
}
+
+ /**
+ * 淇濆瓨鍥芥爣鍏宠仈
+ * @param gbId
+ * @return
+ */
+ @Operation(summary = "淇濆瓨鍥芥爣鍏宠仈")
+ @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