From 1a9e49d9ff210e39f6297150db758906a4f02e6f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 19 八月 2022 17:11:51 +0800
Subject: [PATCH] 依赖包版本升级
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java | 108 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 88 insertions(+), 20 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
index 09d4174..1ec4318 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
@@ -1,20 +1,31 @@
package com.genersoft.iot.vmp.vmanager.streamProxy;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
-import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyDto;
+import com.genersoft.iot.vmp.common.StreamInfo;
+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.IMediaService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.vmanager.service.IStreamProxyService;
+import com.genersoft.iot.vmp.service.IStreamProxyService;
+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;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+@SuppressWarnings("rawtypes")
/**
* 鎷夋祦浠ｇ悊鎺ュ彛
*/
+@Tag(name = "鎷夋祦浠ｇ悊", description = "")
@Controller
@CrossOrigin
@RequestMapping(value = "/api/proxy")
@@ -25,49 +36,106 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private IMediaServerService mediaServerService;
+
@Autowired
private IStreamProxyService streamProxyService;
- @RequestMapping(value = "/list")
+ @Operation(summary = "鍒嗛〉鏌ヨ娴佷唬鐞�")
+ @Parameter(name = "page", description = "褰撳墠椤�")
+ @Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺")
+ @Parameter(name = "query", description = "鏌ヨ鍐呭")
+ @Parameter(name = "online", description = "鏄惁鍦ㄧ嚎")
+ @GetMapping(value = "/list")
@ResponseBody
- public PageInfo<StreamProxyDto> list(@RequestParam(required = false)Integer page,
- @RequestParam(required = false)Integer count,
- @RequestParam(required = false)String q,
- @RequestParam(required = false)Boolean online ){
+ public PageInfo<StreamProxyItem> list(@RequestParam(required = false)Integer page,
+ @RequestParam(required = false)Integer count,
+ @RequestParam(required = false)String query,
+ @RequestParam(required = false)Boolean online ){
return streamProxyService.getAll(page, count);
}
- @RequestMapping(value = "/save")
+ @Operation(summary = "淇濆瓨浠ｇ悊", parameters = {
+ @Parameter(name = "param", description = "浠ｇ悊鍙傛暟", required = true),
+ })
+ @PostMapping(value = "/save")
@ResponseBody
- public Object save(@RequestBody StreamProxyDto param){
+ public WVPResult save(@RequestBody StreamProxyItem param){
logger.info("娣诲姞浠ｇ悊锛� " + JSONObject.toJSONString(param));
- streamProxyService.save(param);
- return "success";
+ if (StringUtils.isEmpty(param.getMediaServerId())) {
+ param.setMediaServerId("auto");
+ }
+ if (StringUtils.isEmpty(param.getType())) {
+ param.setType("default");
+ }
+ if (StringUtils.isEmpty(param.getGbId())) {
+ param.setGbId(null);
+ }
+ WVPResult<StreamInfo> result = streamProxyService.save(param);
+ return result;
}
- @RequestMapping(value = "/del")
+ @GetMapping(value = "/ffmpeg_cmd/list")
@ResponseBody
- public Object del(String app, String stream){
+ @Operation(summary = "鑾峰彇ffmpeg.cmd妯℃澘")
+ @Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = true)
+ public WVPResult getFFmpegCMDs(@RequestParam String mediaServerId){
+ logger.debug("鑾峰彇鑺傜偣[ {} ]ffmpeg.cmd妯℃澘", mediaServerId );
+
+ MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
+ JSONObject data = streamProxyService.getFFmpegCMDs(mediaServerItem);
+ WVPResult<JSONObject> result = new WVPResult<>();
+ result.setCode(0);
+ result.setMsg("success");
+ result.setData(data);
+ return result;
+ }
+
+ @DeleteMapping(value = "/del")
+ @ResponseBody
+ @Operation(summary = "绉婚櫎浠ｇ悊")
+ @Parameter(name = "app", description = "搴旂敤鍚�", required = true)
+ @Parameter(name = "stream", description = "娴乮d", required = true)
+ public WVPResult del(@RequestParam String app, @RequestParam String stream){
logger.info("绉婚櫎浠ｇ悊锛� " + app + "/" + stream);
- streamProxyService.del(app, stream);
- return "success";
+ WVPResult<Object> result = new WVPResult<>();
+ if (app == null || stream == null) {
+ result.setCode(400);
+ result.setMsg(app == null ?"app涓嶈兘涓簄ull":"stream涓嶈兘涓簄ull");
+ }else {
+ streamProxyService.del(app, stream);
+ result.setCode(0);
+ result.setMsg("success");
+ }
+ return result;
}
- @RequestMapping(value = "/start")
+ @GetMapping(value = "/start")
@ResponseBody
+ @Operation(summary = "鍚敤浠ｇ悊")
+ @Parameter(name = "app", description = "搴旂敤鍚�", required = true)
+ @Parameter(name = "stream", description = "娴乮d", required = true)
public Object start(String app, String stream){
logger.info("鍚敤浠ｇ悊锛� " + app + "/" + stream);
boolean result = streamProxyService.start(app, stream);
- return "success";
+ if (!result) {
+ logger.info("鍚敤浠ｇ悊澶辫触锛� " + app + "/" + stream);
+ }
+ return result?"success":"fail";
}
- @RequestMapping(value = "/stop")
+ @GetMapping(value = "/stop")
@ResponseBody
+ @Operation(summary = "鍋滅敤浠ｇ悊")
+ @Parameter(name = "app", description = "搴旂敤鍚�", required = true)
+ @Parameter(name = "stream", description = "娴乮d", required = true)
public Object stop(String app, String stream){
logger.info("鍋滅敤浠ｇ悊锛� " + app + "/" + stream);
boolean result = streamProxyService.stop(app, stream);
- return "success";
+ return result?"success":"fail";
}
}
--
Gitblit v1.8.0