From 2e98b20bea4463e4465e3c19059d0744a09aec06 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 27 Jun 2023 14:34:41 +0800
Subject: [PATCH] gb28181版本升级-补充
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java | 155 +++++++++++++++++++++++++++++++++------------------
1 files changed, 101 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
index cf0fed8..d0aff58 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
@@ -3,21 +3,29 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelReader;
import com.alibaba.excel.read.metadata.ReadSheet;
+import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.SecurityUtils;
+import com.genersoft.iot.vmp.conf.security.dto.LoginUser;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.service.IMediaService;
import com.genersoft.iot.vmp.service.IStreamPushService;
import com.genersoft.iot.vmp.service.impl.StreamPushUploadFileHandler;
import com.genersoft.iot.vmp.vmanager.bean.BatchGBStreamParam;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.poi.sl.usermodel.Sheet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -25,11 +33,13 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
@@ -37,7 +47,7 @@
import java.util.Map;
import java.util.UUID;
-@Api(tags = "推流信息管理")
+@Tag(name = "推流信息管理")
@Controller
@CrossOrigin
@RequestMapping(value = "/api/push")
@@ -54,92 +64,76 @@
@Autowired
private DeferredResultHolder resultHolder;
- @ApiOperation("推流列表查询")
- @ApiImplicitParams({
- @ApiImplicitParam(name="page", value = "当前页", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name="count", value = "每页查询数量", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name="query", value = "查询内容", dataTypeClass = String.class),
- @ApiImplicitParam(name="pushing", value = "是否正在推流", dataTypeClass = Boolean.class),
- @ApiImplicitParam(name="mediaServerId", value = "流媒体ID", dataTypeClass = String.class),
- })
+ @Autowired
+ private IMediaService mediaService;
+
+ @Autowired
+ private UserSetting userSetting;
+
@GetMapping(value = "/list")
@ResponseBody
+ @Operation(summary = "推流列表查询")
+ @Parameter(name = "page", description = "当前页")
+ @Parameter(name = "count", description = "每页查询数量")
+ @Parameter(name = "query", description = "查询内容")
+ @Parameter(name = "pushing", description = "是否正在推流")
+ @Parameter(name = "mediaServerId", description = "流媒体ID")
public PageInfo<StreamPushItem> list(@RequestParam(required = false)Integer page,
@RequestParam(required = false)Integer count,
@RequestParam(required = false)String query,
@RequestParam(required = false)Boolean pushing,
@RequestParam(required = false)String mediaServerId ){
- if (StringUtils.isEmpty(query)) {
+ if (ObjectUtils.isEmpty(query)) {
query = null;
}
- if (StringUtils.isEmpty(mediaServerId)) {
+ if (ObjectUtils.isEmpty(mediaServerId)) {
mediaServerId = null;
}
PageInfo<StreamPushItem> pushList = streamPushService.getPushList(page, count, query, pushing, mediaServerId);
return pushList;
}
- @ApiOperation("将推流添加到国标")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "stream", value = "直播流关联国标平台", dataTypeClass = GbStream.class),
- })
@PostMapping(value = "/save_to_gb")
@ResponseBody
- public Object saveToGB(@RequestBody GbStream stream){
- if (streamPushService.saveToGB(stream)){
- return "success";
- }else {
- return "fail";
+ @Operation(summary = "将推流添加到国标")
+ public void saveToGB(@RequestBody GbStream stream){
+ if (!streamPushService.saveToGB(stream)){
+ throw new ControllerException(ErrorCode.ERROR100);
}
}
- @ApiOperation("将推流移出到国标")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "stream", value = "直播流关联国标平台", dataTypeClass = GbStream.class),
- })
@DeleteMapping(value = "/remove_form_gb")
@ResponseBody
- public Object removeFormGB(@RequestBody GbStream stream){
- if (streamPushService.removeFromGB(stream)){
- return "success";
- }else {
- return "fail";
+ @Operation(summary = "将推流移出到国标")
+ public void removeFormGB(@RequestBody GbStream stream){
+ if (!streamPushService.removeFromGB(stream)){
+ throw new ControllerException(ErrorCode.ERROR100);
}
}
- @ApiOperation("中止一个推流")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "app", value = "应用名", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "streamId", value = "流ID", required = true, dataTypeClass = String.class),
- })
@PostMapping(value = "/stop")
@ResponseBody
- public Object stop(String app, String streamId){
- if (streamPushService.stop(app, streamId)){
- return "success";
- }else {
- return "fail";
+ @Operation(summary = "中止一个推流")
+ @Parameter(name = "app", description = "应用名", required = true)
+ @Parameter(name = "stream", description = "流id", required = true)
+ public void stop(String app, String streamId){
+ if (!streamPushService.stop(app, streamId)){
+ throw new ControllerException(ErrorCode.ERROR100);
}
}
- @ApiOperation("中止多个推流")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "app", value = "应用名", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "streamId", value = "流ID", required = true, dataTypeClass = String.class),
- })
@DeleteMapping(value = "/batchStop")
@ResponseBody
- public Object batchStop(@RequestBody BatchGBStreamParam batchGBStreamParam){
+ @Operation(summary = "中止多个推流")
+ public void batchStop(@RequestBody BatchGBStreamParam batchGBStreamParam){
if (batchGBStreamParam.getGbStreams().size() == 0) {
- return "fail";
+ throw new ControllerException(ErrorCode.ERROR100);
}
- if (streamPushService.batchStop(batchGBStreamParam.getGbStreams())){
- return "success";
- }else {
- return "fail";
+ if (!streamPushService.batchStop(batchGBStreamParam.getGbStreams())){
+ throw new ControllerException(ErrorCode.ERROR100);
}
}
@@ -237,5 +231,58 @@
return result;
}
+ /**
+ * 获取推流播放地址
+ * @param app 应用名
+ * @param stream 流id
+ * @return
+ */
+ @GetMapping(value = "/getPlayUrl")
+ @ResponseBody
+ @Operation(summary = "获取推流播放地址")
+ @Parameter(name = "app", description = "应用名", required = true)
+ @Parameter(name = "stream", description = "流id", required = true)
+ @Parameter(name = "mediaServerId", description = "媒体服务器id")
+ public StreamInfo getPlayUrl(@RequestParam String app,@RequestParam String stream,
+ @RequestParam(required = false) String mediaServerId){
+ boolean authority = false;
+ // 是否登陆用户, 登陆用户返回完整信息
+ LoginUser userInfo = SecurityUtils.getUserInfo();
+ if (userInfo!= null) {
+ authority = true;
+ }
+ StreamPushItem push = streamPushService.getPush(app, stream);
+ if (push != null && !push.isSelf()) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "来自其他平台的推流信息");
+ }
+ StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(app, stream, mediaServerId, authority);
+ if (streamInfo == null){
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "获取播放地址失败");
+ }
+ return streamInfo;
+ }
+ /**
+ * 添加推流信息
+ * @param stream 推流信息
+ * @return
+ */
+ @PostMapping(value = "/add")
+ @ResponseBody
+ @Operation(summary = "添加推流信息")
+ public void add(@RequestBody StreamPushItem stream){
+ if (ObjectUtils.isEmpty(stream.getGbId())) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "国标ID不可为空");
+ }
+ if (ObjectUtils.isEmpty(stream.getApp()) && ObjectUtils.isEmpty(stream.getStream())) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "app或stream不可为空");
+ }
+ stream.setStatus(false);
+ stream.setPushIng(false);
+ stream.setAliveSecond(0L);
+ stream.setTotalReaderCount("0");
+ if (!streamPushService.add(stream)) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
+ }
}
--
Gitblit v1.9.3