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/streamProxy/StreamProxyController.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
old mode 100644
new mode 100755
index d1368d8..e28ca11
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
@@ -2,12 +2,17 @@
import com.alibaba.fastjson2.JSONObject;
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.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IStreamProxyService;
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 com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -18,6 +23,9 @@
import org.springframework.stereotype.Controller;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.async.DeferredResult;
+
+import java.util.UUID;
@SuppressWarnings("rawtypes")
/**
@@ -25,7 +33,7 @@
*/
@Tag(name = "鎷夋祦浠ｇ悊", description = "")
@Controller
-@CrossOrigin
+
@RequestMapping(value = "/api/proxy")
public class StreamProxyController {
@@ -36,6 +44,12 @@
@Autowired
private IStreamProxyService streamProxyService;
+
+ @Autowired
+ private DeferredResultHolder resultHolder;
+
+ @Autowired
+ private UserSetting userSetting;
@Operation(summary = "鍒嗛〉鏌ヨ娴佷唬鐞�")
@@ -53,12 +67,22 @@
return streamProxyService.getAll(page, count);
}
+ @Operation(summary = "鏌ヨ娴佷唬鐞�")
+ @Parameter(name = "app", description = "搴旂敤鍚�")
+ @Parameter(name = "stream", description = "娴両d")
+ @GetMapping(value = "/one")
+ @ResponseBody
+ public StreamProxyItem one(String app, String stream){
+
+ return streamProxyService.getStreamProxyByAppAndStream(app, stream);
+ }
+
@Operation(summary = "淇濆瓨浠ｇ悊", parameters = {
@Parameter(name = "param", description = "浠ｇ悊鍙傛暟", required = true),
})
@PostMapping(value = "/save")
@ResponseBody
- public StreamInfo save(@RequestBody StreamProxyItem param){
+ public DeferredResult<Object> save(@RequestBody StreamProxyItem param){
logger.info("娣诲姞浠ｇ悊锛� " + JSONObject.toJSONString(param));
if (ObjectUtils.isEmpty(param.getMediaServerId())) {
param.setMediaServerId("auto");
@@ -66,10 +90,43 @@
if (ObjectUtils.isEmpty(param.getType())) {
param.setType("default");
}
+ if (ObjectUtils.isEmpty(param.getRtpType())) {
+ param.setRtpType("1");
+ }
if (ObjectUtils.isEmpty(param.getGbId())) {
param.setGbId(null);
}
- return streamProxyService.save(param);
+ StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());
+ if (streamProxyItem != null) {
+ streamProxyService.del(param.getApp(), param.getStream());
+ }
+
+ RequestMessage requestMessage = new RequestMessage();
+ String key = DeferredResultHolder.CALLBACK_CMD_PROXY + param.getApp() + param.getStream();
+ requestMessage.setKey(key);
+ String uuid = UUID.randomUUID().toString();
+ requestMessage.setId(uuid);
+ DeferredResult<Object> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());
+ // 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
+ resultHolder.put(key, uuid, result);
+ result.onTimeout(()->{
+ WVPResult<StreamInfo> wvpResult = new WVPResult<>();
+ wvpResult.setCode(ErrorCode.ERROR100.getCode());
+ wvpResult.setMsg("瓒呮椂");
+ requestMessage.setData(wvpResult);
+ resultHolder.invokeAllResult(requestMessage);
+ });
+
+ streamProxyService.save(param, (code, msg, streamInfo) -> {
+ logger.info("[鎷夋祦浠ｇ悊] {}", code == ErrorCode.SUCCESS.getCode()? "鎴愬姛":"澶辫触锛� " + msg);
+ if (code == ErrorCode.SUCCESS.getCode()) {
+ requestMessage.setData(new StreamContent(streamInfo));
+ }else {
+ requestMessage.setData(WVPResult.fail(code, msg));
+ }
+ resultHolder.invokeAllResult(requestMessage);
+ });
+ return result;
}
@GetMapping(value = "/ffmpeg_cmd/list")
--
Gitblit v1.8.0