调整上级观看消息的发送

648540858

2024-05-29 764d04b497356ba6bcbb75fd42b51eca750f7223

 src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java

old mode 100644
new mode 100755
@@ -6,27 +6,23 @@
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.JwtUtils;
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.media.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.genersoft.iot.vmp.vmanager.bean.*;
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.apache.poi.sl.usermodel.Sheet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,12 +30,10 @@
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;
@@ -49,7 +43,7 @@

@Tag(name  = "推流信息管理")
@Controller
@CrossOrigin

@RequestMapping(value = "/api/push")
public class StreamPushController {

@@ -72,7 +66,7 @@

    @GetMapping(value = "/list")
    @ResponseBody
    @Operation(summary = "推流列表查询")
    @Operation(summary = "推流列表查询", security = @SecurityRequirement(name = JwtUtils.HEADER))
    @Parameter(name = "page", description = "当前页")
    @Parameter(name = "count", description = "每页查询数量")
    @Parameter(name = "query", description = "查询内容")
@@ -96,7 +90,7 @@

    @PostMapping(value = "/save_to_gb")
    @ResponseBody
    @Operation(summary = "将推流添加到国标")
    @Operation(summary = "将推流添加到国标", security = @SecurityRequirement(name = JwtUtils.HEADER))
    public void saveToGB(@RequestBody GbStream stream){
        if (!streamPushService.saveToGB(stream)){
           throw new ControllerException(ErrorCode.ERROR100);
@@ -106,7 +100,7 @@

    @DeleteMapping(value = "/remove_form_gb")
    @ResponseBody
    @Operation(summary = "将推流移出到国标")
    @Operation(summary = "将推流移出到国标", security = @SecurityRequirement(name = JwtUtils.HEADER))
    public void removeFormGB(@RequestBody GbStream stream){
        if (!streamPushService.removeFromGB(stream)){
            throw new ControllerException(ErrorCode.ERROR100);
@@ -116,7 +110,7 @@

    @PostMapping(value = "/stop")
    @ResponseBody
    @Operation(summary = "中止一个推流")
    @Operation(summary = "中止一个推流", security = @SecurityRequirement(name = JwtUtils.HEADER))
    @Parameter(name = "app", description = "应用名", required = true)
    @Parameter(name = "stream", description = "流id", required = true)
    public void stop(String app, String streamId){
@@ -127,7 +121,7 @@

    @DeleteMapping(value = "/batchStop")
    @ResponseBody
    @Operation(summary = "中止多个推流")
    @Operation(summary = "中止多个推流", security = @SecurityRequirement(name = JwtUtils.HEADER))
    public void batchStop(@RequestBody BatchGBStreamParam batchGBStreamParam){
        if (batchGBStreamParam.getGbStreams().size() == 0) {
            throw new ControllerException(ErrorCode.ERROR100);
@@ -189,7 +183,7 @@
            String name = file.getName();
            inputStream = file.getInputStream();
        } catch (IOException e) {
            e.printStackTrace();
            logger.error("未处理的异常 ", e);
        }
        try {
            //传入参数
@@ -239,12 +233,12 @@
     */
    @GetMapping(value = "/getPlayUrl")
    @ResponseBody
    @Operation(summary = "获取推流播放地址")
    @Operation(summary = "获取推流播放地址", security = @SecurityRequirement(name = JwtUtils.HEADER))
    @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){
    public StreamContent getPlayUrl(@RequestParam String app, @RequestParam String stream,
                                    @RequestParam(required = false) String mediaServerId){
        boolean authority = false;
        // 是否登陆用户, 登陆用户返回完整信息
        LoginUser userInfo = SecurityUtils.getUserInfo();
@@ -255,11 +249,11 @@
        if (push != null && !push.isSelf()) {
            throw new ControllerException(ErrorCode.ERROR100.getCode(), "来自其他平台的推流信息");
        }
        StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(app, stream, mediaServerId, authority);
        StreamInfo streamInfo = mediaServerService.getStreamInfoByAppAndStreamWithCheck(app, stream, mediaServerId, authority);
        if (streamInfo == null){
            throw new ControllerException(ErrorCode.ERROR100.getCode(), "获取播放地址失败");
        }
        return streamInfo;
        return new StreamContent(streamInfo);
    }

    /**
@@ -269,7 +263,7 @@
     */
    @PostMapping(value = "/add")
    @ResponseBody
    @Operation(summary = "添加推流信息")
    @Operation(summary = "添加推流信息", security = @SecurityRequirement(name = JwtUtils.HEADER))
    public void add(@RequestBody StreamPushItem stream){
        if (ObjectUtils.isEmpty(stream.getGbId())) {
            throw new ControllerException(ErrorCode.ERROR400.getCode(), "国标ID不可为空");
@@ -280,7 +274,7 @@
        stream.setStatus(false);
        stream.setPushIng(false);
        stream.setAliveSecond(0L);
        stream.setTotalReaderCount("0");
        stream.setTotalReaderCount(0);
        if (!streamPushService.add(stream)) {
            throw new ControllerException(ErrorCode.ERROR100);
        }