From ab491a079ba4ab85ffef35d14c0767eba01455d8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 15 一月 2025 09:18:36 +0800
Subject: [PATCH] 切正式服

---
 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java |  663 ++++++++++++++++++++++++++++++++----------------------
 1 files changed, 388 insertions(+), 275 deletions(-)

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
old mode 100644
new mode 100755
index 233e1de..409042c
--- 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
@@ -1,336 +1,449 @@
 package com.genersoft.iot.vmp.vmanager.gb28181.play;
 
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.genersoft.iot.vmp.common.InviteInfo;
+import com.genersoft.iot.vmp.common.InviteSessionType;
 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.gb28181.bean.Device;
 import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
 import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
 import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
+import com.genersoft.iot.vmp.media.service.IMediaServerService;
 import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.service.IMediaServerService;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
-import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
-import com.genersoft.iot.vmp.service.IMediaService;
+import com.genersoft.iot.vmp.service.IInviteStreamService;
 import com.genersoft.iot.vmp.service.IPlayService;
-
+import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.utils.IdUtils;
+import com.genersoft.iot.vmp.vmanager.bean.AudioBroadcastResult;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
 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 okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.bytedeco.javacv.*;
+import org.bytedeco.opencv.global.opencv_imgcodecs;
+import org.bytedeco.opencv.opencv_core.Mat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import org.springframework.beans.factory.annotation.Value;
+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 javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
+import java.awt.image.BufferedImage;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
-@Tag(name  = "鍥芥爣璁惧鐐规挱")
-@CrossOrigin
+
+/**
+ * @author lin
+ */
+@Tag(name = "鍥芥爣璁惧鐐规挱")
+
 @RestController
 @RequestMapping("/api/play")
 public class PlayController {
 
-	private final static Logger logger = LoggerFactory.getLogger(PlayController.class);
+    private final static Logger logger = LoggerFactory.getLogger(PlayController.class);
+    @Value("${platform.upload}")
+    public String upload;
+    @Autowired
+    private SIPCommander cmder;
+    @Autowired
+    private ZLMRESTfulUtils zlmresTfulUtils;
+    @Autowired
+    private VideoStreamSessionManager streamSession;
 
-	@Autowired
-	private SIPCommander cmder;
+    @Autowired
+    private IVideoManagerStorage storager;
 
-	@Autowired
-	private VideoStreamSessionManager streamSession;
+    @Autowired
+    private IInviteStreamService inviteStreamService;
 
-	@Autowired
-	private IVideoManagerStorage storager;
+    @Autowired
+    private DeferredResultHolder resultHolder;
 
-	@Autowired
-	private IRedisCatchStorage redisCatchStorage;
+    @Autowired
+    private IPlayService playService;
 
-	@Autowired
-	private ZLMRESTfulUtils zlmresTfulUtils;
+    @Autowired
+    private IMediaServerService mediaServerService;
 
-	@Autowired
-	private DeferredResultHolder resultHolder;
+    @Autowired
+    private UserSetting userSetting;
 
-	@Autowired
-	private IPlayService playService;
+    private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 
-	@Autowired
-	private IMediaService mediaService;
+    @Operation(summary = "寮�濮嬬偣鎾�", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+    @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+    @GetMapping("/start/{deviceId}/{channelId}")
+    public DeferredResult<WVPResult<StreamContent>> play(HttpServletRequest request, @PathVariable String deviceId,
+                                                         @PathVariable String channelId) {
 
-	@Autowired
-	private IMediaServerService mediaServerService;
+        logger.info("[寮�濮嬬偣鎾璢 deviceId锛歿}, channelId锛歿}, ", deviceId, channelId);
+        // 鑾峰彇鍙敤鐨剒lm
+        Device device = storager.queryVideoDevice(deviceId);
+        MediaServer newMediaServerItem = playService.getNewMediaServerItem(device);
 
-	@Operation(summary = "寮�濮嬬偣鎾�")
-	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
-	@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
-	@GetMapping("/start/{deviceId}/{channelId}")
-	public DeferredResult<ResponseEntity<String>> play(@PathVariable String deviceId,
-													   @PathVariable String channelId) {
+        RequestMessage requestMessage = new RequestMessage();
+        String key = DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId;
+        requestMessage.setKey(key);
+        String uuid = UUID.randomUUID().toString();
+        requestMessage.setId(uuid);
+        DeferredResult<WVPResult<StreamContent>> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());
 
-		// 鑾峰彇鍙敤鐨剒lm
-		Device device = storager.queryVideoDevice(deviceId);
-		MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
-		PlayResult playResult = playService.play(newMediaServerItem, deviceId, channelId, null, null, null);
+        result.onTimeout(() -> {
+            logger.info("[鐐规挱绛夊緟瓒呮椂] deviceId锛歿}, channelId锛歿}, ", deviceId, channelId);
+            // 閲婃斁rtpserver
+            WVPResult<StreamInfo> wvpResult = new WVPResult<>();
+            wvpResult.setCode(ErrorCode.ERROR100.getCode());
+            wvpResult.setMsg("鐐规挱瓒呮椂");
+            requestMessage.setData(wvpResult);
+            resultHolder.invokeAllResult(requestMessage);
+            inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
+            storager.stopPlay(deviceId, channelId);
+        });
 
-		return playResult.getResult();
-	}
+        // 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
+        resultHolder.put(key, uuid, result);
+
+        playService.play(newMediaServerItem, deviceId, channelId, null, (code, msg, data) -> {
+            WVPResult<StreamContent> wvpResult = new WVPResult<>();
+            if (code == InviteErrorCode.SUCCESS.getCode()) {
+                wvpResult.setCode(ErrorCode.SUCCESS.getCode());
+                wvpResult.setMsg(ErrorCode.SUCCESS.getMsg());
+
+                if (data != null) {
+                    StreamInfo streamInfo = (StreamInfo) data;
+                    if (userSetting.getUseSourceIpAsStreamIp()) {
+                        streamInfo = streamInfo.clone();//娣辨嫹璐�
+                        String host;
+                        try {
+                            URL url = new URL(request.getRequestURL().toString());
+                            host = url.getHost();
+                        } catch (MalformedURLException e) {
+                            host = request.getLocalAddr();
+                        }
+                        streamInfo.channgeStreamIp(host);
+                    }
+                    if (!ObjectUtils.isEmpty(newMediaServerItem.getTranscodeSuffix()) && !"null".equalsIgnoreCase(newMediaServerItem.getTranscodeSuffix())) {
+                        streamInfo.setStream(streamInfo.getStream() + "_" + newMediaServerItem.getTranscodeSuffix());
+                    }
+                    wvpResult.setData(new StreamContent(streamInfo));
+                } else {
+                    wvpResult.setCode(code);
+                    wvpResult.setMsg(msg);
+                }
+            } else {
+                wvpResult.setCode(code);
+                wvpResult.setMsg(msg);
+            }
+            requestMessage.setData(wvpResult);
+            // 姝ゅ蹇呴』閲婃斁鎵�鏈夎姹�
+            resultHolder.invokeAllResult(requestMessage);
+        });
+        return result;
+    }
 
 
-	@Operation(summary = "鍋滄鐐规挱")
-	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
-	@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
-	@GetMapping("/stop/{deviceId}/{channelId}")
-	public DeferredResult<ResponseEntity<String>> playStop(@PathVariable String deviceId, @PathVariable String channelId) {
+    @Operation(summary = "寮�濮嬬偣鎾苟杩斿洖鍥剧墖", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+    @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+    @GetMapping("/start/img/{deviceId}/{channelId}")
+    public DeferredResult<WVPResult<String>> playReturnImg(HttpServletRequest request, @PathVariable String deviceId,
+                                                           @PathVariable String channelId) throws IOException {
+        logger.info("[寮�濮嬬偣鎾璢 deviceId锛歿}, channelId锛歿}, ", deviceId, channelId);
+        // 鑾峰彇鍙敤鐨剒lm
+        Device device = storager.queryVideoDevice(deviceId);
+        MediaServer newMediaServerItem = playService.getNewMediaServerItem(device);
+        RequestMessage requestMessage = new RequestMessage();
+        String key = DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId;
+        requestMessage.setKey(key);
+        String uuid = UUID.randomUUID().toString();
+        requestMessage.setId(uuid);
 
-		logger.debug(String.format("璁惧棰勮/鍥炴斁鍋滄API璋冪敤锛宻treamId锛�%s_%s", deviceId, channelId ));
+        //瀛樻椿鏃堕棿
+        DeferredResult<WVPResult<String>> result = new DeferredResult<>(120 * 1000L);
 
-		String uuid = UUID.randomUUID().toString();
-		DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
+        //120绉掑瓨娲�
+        result.onTimeout(() -> {
+            logger.info("[鐐规挱绛夊緟瓒呮椂] deviceId锛歿}, channelId锛歿}, ", deviceId, channelId);
+            // 閲婃斁rtpserver
+            WVPResult<StreamInfo> wvpResult = new WVPResult<>();
+            wvpResult.setCode(ErrorCode.ERROR100.getCode());
+            wvpResult.setMsg("鐐规挱瓒呮椂");
+            requestMessage.setData(wvpResult);
+            resultHolder.invokeAllResult(requestMessage);
+            inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);
+            storager.stopPlay(deviceId, channelId);
+        });
 
-		// 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
-		String key = DeferredResultHolder.CALLBACK_CMD_STOP + deviceId + channelId;
-		resultHolder.put(key, uuid, result);
-		StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
-		if (streamInfo == null) {
-			RequestMessage msg = new RequestMessage();
-			msg.setId(uuid);
-			msg.setKey(key);
-			msg.setData("鐐规挱鏈壘鍒�");
-			resultHolder.invokeAllResult(msg);
-			storager.stopPlay(deviceId, channelId);
-			return result;
-		}
-		cmder.streamByeCmd(deviceId, channelId, streamInfo.getStream(), null, eventResult -> {
-			redisCatchStorage.stopPlay(streamInfo);
-			storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
-			RequestMessage msgForSuccess = new RequestMessage();
-			msgForSuccess.setId(uuid);
-			msgForSuccess.setKey(key);
-			msgForSuccess.setData(String.format("success"));
-			resultHolder.invokeAllResult(msgForSuccess);
-		});
+        // 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
+        resultHolder.put(key, uuid, result);
 
-		if (deviceId != null || channelId != null) {
-			JSONObject json = new JSONObject();
-			json.put("deviceId", deviceId);
-			json.put("channelId", channelId);
-			RequestMessage msg = new RequestMessage();
-			msg.setId(uuid);
-			msg.setKey(key);
-			msg.setData(json.toString());
-			resultHolder.invokeAllResult(msg);
-		} else {
-			logger.warn("璁惧棰勮/鍥炴斁鍋滄API璋冪敤澶辫触锛�");
-			RequestMessage msg = new RequestMessage();
-			msg.setId(uuid);
-			msg.setKey(key);
-			msg.setData("streamId null");
-			resultHolder.invokeAllResult(msg);
-		}
+        playService.play(newMediaServerItem, deviceId, channelId, null, (code, msg, data) -> {
+            WVPResult<String> wvpResult = new WVPResult<>();
+            if (code == InviteErrorCode.SUCCESS.getCode()) {
+                wvpResult.setCode(ErrorCode.SUCCESS.getCode());
+                wvpResult.setMsg(ErrorCode.SUCCESS.getMsg());
 
-		// 瓒呮椂澶勭悊
-		result.onTimeout(()->{
-			logger.warn(String.format("璁惧棰勮/鍥炴斁鍋滄瓒呮椂锛宒eviceId/channelId锛�%s_%s ", deviceId, channelId));
-			redisCatchStorage.stopPlay(streamInfo);
-			storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
-			RequestMessage msg = new RequestMessage();
-			msg.setId(uuid);
-			msg.setKey(key);
-			msg.setData("Timeout");
-			resultHolder.invokeAllResult(msg);
-		});
-		return result;
-	}
+                if (data != null) {
+                    StreamInfo streamInfo = (StreamInfo) data;
+                    if (userSetting.getUseSourceIpAsStreamIp()) {
+                        streamInfo = streamInfo.clone();//娣辨嫹璐�
+                        String host;
+                        try {
+                            URL url = new URL(request.getRequestURL().toString());
+                            host = url.getHost();
+                        } catch (MalformedURLException e) {
+                            host = request.getLocalAddr();
+                        }
+                        streamInfo.channgeStreamIp(host);
+                    }
+                    if (!ObjectUtils.isEmpty(newMediaServerItem.getTranscodeSuffix()) && !"null".equalsIgnoreCase(newMediaServerItem.getTranscodeSuffix())) {
+                        streamInfo.setStream(streamInfo.getStream() + "_" + newMediaServerItem.getTranscodeSuffix());
+                    }
+                    StreamContent streamContent = new StreamContent(streamInfo);
+                    String rtspUrl = streamContent.getFmp4(); // 鍙杕p4鍦板潃
+                    String img = getImg(rtspUrl);
+                    wvpResult.setData(img);
+                } else {
+                    wvpResult.setCode(code);
+                    wvpResult.setMsg(msg);
+                }
+            } else {
+                wvpResult.setCode(code);
+                wvpResult.setMsg(msg);
+            }
+            requestMessage.setData(wvpResult);
+            // 姝ゅ蹇呴』閲婃斁鎵�鏈夎姹�
+            resultHolder.invokeAllResult(requestMessage);
+        });
+        return result;
+    }
 
-	/**
-	 * 灏嗕笉鏄痟264鐨勮棰戦�氳繃ffmpeg 杞爜涓篽264 + aac
-	 * @param streamId 娴両D
-	 * @return
-	 */
-	@Operation(summary = "灏嗕笉鏄痟264鐨勮棰戦�氳繃ffmpeg 杞爜涓篽264 + aac")
-	@Parameter(name = "streamId", description = "瑙嗛娴両D", required = true)
-	@PostMapping("/convert/{streamId}")
-	public ResponseEntity<String> playConvert(@PathVariable String streamId) {
-		StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
-		if (streamInfo == null) {
-			streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
-		}
-		if (streamInfo == null) {
-			logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡缁忓仠姝�!");
-			return new ResponseEntity<String>("鏈壘鍒拌棰戞祦淇℃伅, 瑙嗛娴佸彲鑳藉凡缁忓仠姝�", HttpStatus.OK);
-		}
-		MediaServerItem mediaInfo = mediaServerService.getOne(streamInfo.getMediaServerId());
-		JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaInfo, streamId);
-		if (!rtpInfo.getBoolean("exist")) {
-			logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡鍋滄鎺ㄦ祦!");
-			return new ResponseEntity<String>("鎺ㄦ祦淇℃伅鍦ㄦ祦濯掍綋涓笉瀛樺湪, 瑙嗛娴佸彲鑳藉凡鍋滄鎺ㄦ祦", HttpStatus.OK);
-		} else {
-			String dstUrl = String.format("rtmp://%s:%s/convert/%s", "127.0.0.1", mediaInfo.getRtmpPort(),
-					streamId );
-			String srcUrl = String.format("rtsp://%s:%s/rtp/%s", "127.0.0.1", mediaInfo.getRtspPort(), streamId);
-			JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(mediaInfo, srcUrl, dstUrl, "1000000", true, false, null);
-			logger.info(jsonObject.toJSONString());
-			JSONObject result = new JSONObject();
-			if (jsonObject != null && jsonObject.getInteger("code") == 0) {
-				   result.put("code", 0);
-				JSONObject data = jsonObject.getJSONObject("data");
-				if (data != null) {
-				   	result.put("key", data.getString("key"));
-					StreamInfo streamInfoResult = mediaService.getStreamInfoByAppAndStreamWithCheck("convert", streamId, mediaInfo.getId(), false);
-					result.put("data", streamInfoResult);
-				}
-			}else {
-				result.put("code", 1);
-				result.put("msg", "cover fail");
-			}
-			return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
-		}
-	}
+    private String getImg(String rtspUrl) {
+        String imgUrl = null;
+        if (StringUtils.hasText(rtspUrl)) {
+            System.out.println("鐩爣鍦板潃锛�" + rtspUrl);
+            FFmpegFrameGrabber grabber = null;
+            try {
+                grabber = new FFmpegFrameGrabber(rtspUrl);
+//                grabber.setOption("rtsp_transport", "tcp"); // 浣跨敤tcp鐨勬柟寮忥紝涓嶇劧浼氫涪鍖呭緢涓ラ噸
+//                grabber.setVideoOption("probesize", "10000"); // 璁剧疆鎹曡幏鍒嗘瀽鐨勬渶澶у瓧鑺�
+//                grabber.setFrameRate(25);
+                grabber.startUnsafe();
+                Frame frame = grabber.grabImage(); // 鐩存帴鎹曡幏涓�甯�
+//                //杞崲鍥惧儚
+//                Java2DFrameConverter converter = new Java2DFrameConverter();
+//                BufferedImage srcImage = converter.getBufferedImage(frame);
+//                if (srcImage!=null) {
+//                    //鍒涘缓鏂囦欢
+//                    File file = new File(picPath);
+//                    //杈撳嚭鏂囦欢
+//                    ImageIO.write(srcImage, "png", file);
+//                }
 
-	/**
-	 * 缁撴潫杞爜
-	 * @param key
-	 * @return
-	 */
-	@Operation(summary = "缁撴潫杞爜")
-	@Parameter(name = "key", description = "瑙嗛娴乲ey", required = true)
-	@Parameter(name = "mediaServerId", description = "娴佸獟浣撴湇鍔D", required = true)
-	@PostMapping("/convertStop/{key}")
-	public ResponseEntity<String> playConvertStop(@PathVariable String key, String mediaServerId) {
-		JSONObject result = new JSONObject();
-		if (mediaServerId == null) {
-			result.put("code", 400);
-			result.put("msg", "mediaServerId is null");
-			return new ResponseEntity<String>( result.toJSONString(), HttpStatus.BAD_REQUEST);
-		}
-		MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
-		if (mediaInfo == null) {
-			result.put("code", 0);
-			result.put("msg", "浣跨敤鐨勬祦濯掍綋宸茬粡鍋滄杩愯");
-			return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
-		}else {
-			JSONObject jsonObject = zlmresTfulUtils.delFFmpegSource(mediaInfo, key);
-			logger.info(jsonObject.toJSONString());
-			if (jsonObject != null && jsonObject.getInteger("code") == 0) {
-				result.put("code", 0);
-				JSONObject data = jsonObject.getJSONObject("data");
-				if (data != null && data.getBoolean("flag")) {
-					result.put("code", "0");
-					result.put("msg", "success");
-				}else {
+                if (frame != null) {
+                    System.out.println("鎴愬姛鎹曡幏涓�甯�");
+                    // 灏咶rame杞崲涓篗at
+                    OpenCVFrameConverter.ToMat converter = new OpenCVFrameConverter.ToMat();
+                    Mat mat = converter.convertToMat(frame);
 
-				}
-			}else {
-				result.put("code", 1);
-				result.put("msg", "delFFmpegSource fail");
-			}
-			return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
-		}
+                    imgUrl = format.format(new Date()) + "_" + IdUtils.randomUUID() + ".png";
+                    // 鐢熸垚鍥剧墖璺緞
+                    String imgPath = upload + imgUrl;
+                    System.out.println("鍥剧墖淇濆瓨鍦板潃锛�" + imgPath);
+                    imgUrl = "/profile/" + imgUrl;
+                    // 淇濆瓨鍥剧墖
+                    opencv_imgcodecs.imwrite(imgPath, mat);
+                } else {
+                    System.out.println("鏈崟鑾峰埌甯�");
+                }
+            } catch (FrameGrabber.Exception e) {
+                e.printStackTrace();
+            } finally {
+                if (grabber != null) {
+                    try {
+                        grabber.stop(); // 鍋滄鎹曡幏
+                    } catch (FrameGrabber.Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        return imgUrl;
+    }
 
 
-	}
+    @Operation(summary = "鍋滄鐐规挱", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+    @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+    @GetMapping("/stop/{deviceId}/{channelId}")
+    public JSONObject playStop(@PathVariable String deviceId, @PathVariable String channelId) {
 
-	@Operation(summary = "璇煶骞挎挱鍛戒护")
-	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
-    @GetMapping("/broadcast/{deviceId}")
-    @PostMapping("/broadcast/{deviceId}")
-    public DeferredResult<ResponseEntity<String>> broadcastApi(@PathVariable String deviceId) {
+        logger.debug(String.format("璁惧棰勮/鍥炴斁鍋滄API璋冪敤锛宻treamId锛�%s_%s", deviceId, channelId));
+
+        if (deviceId == null || channelId == null) {
+            throw new ControllerException(ErrorCode.ERROR400);
+        }
+
+        Device device = storager.queryVideoDevice(deviceId);
+        if (device == null) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "璁惧[" + deviceId + "]涓嶅瓨鍦�");
+        }
+
+        playService.stopPlay(device, channelId);
+        JSONObject json = new JSONObject();
+        json.put("deviceId", deviceId);
+        json.put("channelId", channelId);
+        return json;
+    }
+
+    /**
+     * 缁撴潫杞爜
+     */
+    @Operation(summary = "缁撴潫杞爜", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "key", description = "瑙嗛娴乲ey", required = true)
+    @Parameter(name = "mediaServerId", description = "娴佸獟浣撴湇鍔D", required = true)
+    @PostMapping("/convertStop/{key}")
+    public void playConvertStop(@PathVariable String key, String mediaServerId) {
+        if (mediaServerId == null) {
+            throw new ControllerException(ErrorCode.ERROR400.getCode(), "娴佸獟浣擄細" + mediaServerId + "涓嶅瓨鍦�");
+        }
+        MediaServer mediaInfo = mediaServerService.getOne(mediaServerId);
+        if (mediaInfo == null) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "浣跨敤鐨勬祦濯掍綋宸茬粡鍋滄杩愯");
+        } else {
+            Boolean deleted = mediaServerService.delFFmpegSource(mediaInfo, key);
+            if (!deleted) {
+                throw new ControllerException(ErrorCode.ERROR100);
+            }
+        }
+    }
+
+    @Operation(summary = "璇煶骞挎挱鍛戒护", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+    @Parameter(name = "deviceId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+    @Parameter(name = "timeout", description = "鎺ㄦ祦瓒呮椂鏃堕棿(绉�)", required = true)
+    @GetMapping("/broadcast/{deviceId}/{channelId}")
+    @PostMapping("/broadcast/{deviceId}/{channelId}")
+    public AudioBroadcastResult broadcastApi(@PathVariable String deviceId, @PathVariable String channelId, Integer timeout, Boolean broadcastMode) {
         if (logger.isDebugEnabled()) {
             logger.debug("璇煶骞挎挱API璋冪敤");
         }
         Device device = storager.queryVideoDevice(deviceId);
-		DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
-		String key  = DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId;
-		if (resultHolder.exist(key, null)) {
-			result.setResult(new ResponseEntity<>("璁惧浣跨敤涓�",HttpStatus.OK));
-			return result;
-		}
-		String uuid  = UUID.randomUUID().toString();
         if (device == null) {
+            throw new ControllerException(ErrorCode.ERROR400.getCode(), "鏈壘鍒拌澶囷細 " + deviceId);
+        }
+        if (channelId == null) {
+            throw new ControllerException(ErrorCode.ERROR400.getCode(), "鏈壘鍒伴�氶亾锛� " + channelId);
+        }
 
-			resultHolder.put(key, key,  result);
-			RequestMessage msg = new RequestMessage();
-			msg.setKey(key);
-			msg.setId(uuid);
-			JSONObject json = new JSONObject();
-			json.put("DeviceID", deviceId);
-			json.put("CmdType", "Broadcast");
-			json.put("Result", "Failed");
-			json.put("Description", "Device 涓嶅瓨鍦�");
-			msg.setData(json);
-			resultHolder.invokeResult(msg);
-			return result;
-		}
-		cmder.audioBroadcastCmd(device, (event) -> {
-			RequestMessage msg = new RequestMessage();
-			msg.setKey(key);
-			msg.setId(uuid);
-			JSONObject json = new JSONObject();
-			json.put("DeviceID", deviceId);
-			json.put("CmdType", "Broadcast");
-			json.put("Result", "Failed");
-			json.put("Description", String.format("璇煶骞挎挱鎿嶄綔澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg));
-			msg.setData(json);
-			resultHolder.invokeResult(msg);
-		});
+        return playService.audioBroadcast(device, channelId, broadcastMode);
 
-		result.onTimeout(() -> {
-			logger.warn(String.format("璇煶骞挎挱鎿嶄綔瓒呮椂, 璁惧鏈繑鍥炲簲绛旀寚浠�"));
-			RequestMessage msg = new RequestMessage();
-			msg.setKey(key);
-			msg.setId(uuid);
-			JSONObject json = new JSONObject();
-			json.put("DeviceID", deviceId);
-			json.put("CmdType", "Broadcast");
-			json.put("Result", "Failed");
-			json.put("Error", "Timeout. Device did not response to broadcast command.");
-			msg.setData(json);
-			resultHolder.invokeResult(msg);
-		});
-		resultHolder.put(key, uuid, result);
-		return result;
-	}
+    }
 
-	@Operation(summary = "鑾峰彇鎵�鏈夌殑ssrc")
-	@GetMapping("/ssrc")
-	public WVPResult<JSONObject> getSSRC() {
-		if (logger.isDebugEnabled()) {
-			logger.debug("鑾峰彇鎵�鏈夌殑ssrc");
-		}
-		JSONArray objects = new JSONArray();
-		List<SsrcTransaction> allSsrc = streamSession.getAllSsrc();
-		for (SsrcTransaction transaction : allSsrc) {
-			JSONObject jsonObject = new JSONObject();
-			jsonObject.put("deviceId", transaction.getDeviceId());
-			jsonObject.put("channelId", transaction.getChannelId());
-			jsonObject.put("ssrc", transaction.getSsrc());
-			jsonObject.put("streamId", transaction.getStream());
-			objects.add(jsonObject);
-		}
+    @Operation(summary = "鍋滄璇煶骞挎挱")
+    @Parameter(name = "deviceId", description = "璁惧Id", required = true)
+    @Parameter(name = "channelId", description = "閫氶亾Id", required = true)
+    @GetMapping("/broadcast/stop/{deviceId}/{channelId}")
+    @PostMapping("/broadcast/stop/{deviceId}/{channelId}")
+    public void stopBroadcast(@PathVariable String deviceId, @PathVariable String channelId) {
+        if (logger.isDebugEnabled()) {
+            logger.debug("鍋滄璇煶骞挎挱API璋冪敤");
+        }
+//		try {
+//			playService.stopAudioBroadcast(deviceId, channelId);
+//		} catch (InvalidArgumentException | ParseException  | SipException e) {
+//			logger.error("[鍛戒护鍙戦�佸け璐 鍋滄璇煶: {}", e.getMessage());
+//			throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " +  e.getMessage());
+//		}
+        playService.stopAudioBroadcast(deviceId, channelId);
+    }
 
-		WVPResult<JSONObject> result = new WVPResult<>();
-		result.setCode(0);
-		result.setMsg("success");
-		JSONObject jsonObject = new JSONObject();
-		jsonObject.put("data", objects);
-		jsonObject.put("count", objects.size());
-		result.setData(jsonObject);
-		return result;
-	}
+    @Operation(summary = "鑾峰彇鎵�鏈夌殑ssrc", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @GetMapping("/ssrc")
+    public JSONObject getSSRC() {
+        if (logger.isDebugEnabled()) {
+            logger.debug("鑾峰彇鎵�鏈夌殑ssrc");
+        }
+        JSONArray objects = new JSONArray();
+        List<SsrcTransaction> allSsrc = streamSession.getAllSsrc();
+        for (SsrcTransaction transaction : allSsrc) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("deviceId", transaction.getDeviceId());
+            jsonObject.put("channelId", transaction.getChannelId());
+            jsonObject.put("ssrc", transaction.getSsrc());
+            jsonObject.put("streamId", transaction.getStream());
+            objects.add(jsonObject);
+        }
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("data", objects);
+        jsonObject.put("count", objects.size());
+        return jsonObject;
+    }
+
+    @Operation(summary = "鑾峰彇鎴浘", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+    @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+    @Parameter(name = "isSubStream", description = "鏄惁瀛愮爜娴侊紙true-瀛愮爜娴侊紝false-涓荤爜娴侊級锛岄粯璁や负false", required = true)
+    @GetMapping("/snap")
+    public DeferredResult<String> getSnap(String deviceId, String channelId, boolean isSubStream) {
+        if (logger.isDebugEnabled()) {
+            logger.debug("鑾峰彇鎴浘: {}/{}", deviceId, channelId);
+        }
+
+        DeferredResult<String> result = new DeferredResult<>(3 * 1000L);
+        String key = DeferredResultHolder.CALLBACK_CMD_SNAP + deviceId;
+        String uuid = UUID.randomUUID().toString();
+        resultHolder.put(key, uuid, result);
+
+        RequestMessage message = new RequestMessage();
+        message.setKey(key);
+        message.setId(uuid);
+
+        String fileName = deviceId + "_" + channelId + "_" + DateUtil.getNowForUrl() + ".jpg";
+        playService.getSnap(deviceId, channelId, fileName, (code, msg, data) -> {
+            if (code == InviteErrorCode.SUCCESS.getCode()) {
+                message.setData(data);
+            } else {
+                message.setData(WVPResult.fail(code, msg));
+            }
+            resultHolder.invokeResult(message);
+        });
+        return result;
+    }
 
 }
 

--
Gitblit v1.8.0