From 5d901b5e3f033e8b04e53420d68626cbd87431c8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 06 五月 2022 10:12:34 +0800
Subject: [PATCH] 使用阿里代码规范。规范代码写法
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java | 77 ++++++++++++++++++++++++++++++--------
1 files changed, 61 insertions(+), 16 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 d7e6201..f2e48d8 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,21 +1,27 @@
package com.genersoft.iot.vmp.vmanager.streamProxy;
import com.alibaba.fastjson.JSONObject;
+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.service.IStreamProxyService;
+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.models.auth.In;
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")
/**
* 鎷夋祦浠ｇ悊鎺ュ彛
*/
@@ -30,6 +36,10 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private IMediaServerService mediaServerService;
+
@Autowired
private IStreamProxyService streamProxyService;
@@ -41,7 +51,7 @@
@ApiImplicitParam(name="query", value = "鏌ヨ鍐呭", dataTypeClass = String.class),
@ApiImplicitParam(name="online", value = "鏄惁鍦ㄧ嚎", dataTypeClass = Boolean.class),
})
- @RequestMapping(value = "/list")
+ @GetMapping(value = "/list")
@ResponseBody
public PageInfo<StreamProxyItem> list(@RequestParam(required = false)Integer page,
@RequestParam(required = false)Integer count,
@@ -55,25 +65,60 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "param", value = "浠ｇ悊鍙傛暟", dataTypeClass = StreamProxyItem.class),
})
- @RequestMapping(value = "/save")
+ @PostMapping(value = "/save")
@ResponseBody
- public Object save(@RequestBody StreamProxyItem 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;
+ }
+
+ @ApiOperation("鑾峰彇ffmpeg.cmd妯℃澘")
+ @GetMapping(value = "/ffmpeg_cmd/list")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "mediaServerId", value = "娴佸獟浣揑D", dataTypeClass = String.class),
+ })
+ @ResponseBody
+ 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;
}
@ApiOperation("绉婚櫎浠ｇ悊")
@ApiImplicitParams({
- @ApiImplicitParam(name = "app", value = "搴旂敤鍚�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "stream", value = "娴両D", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "app", value = "搴旂敤鍚�", required = true, dataTypeClass = String.class),
+ @ApiImplicitParam(name = "stream", value = "娴両D", required = true, dataTypeClass = String.class),
})
- @RequestMapping(value = "/del")
+ @DeleteMapping(value = "/del")
@ResponseBody
- public Object del(String app, String stream){
+ 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;
}
@ApiOperation("鍚敤浠ｇ悊")
@@ -81,12 +126,12 @@
@ApiImplicitParam(name = "app", value = "搴旂敤鍚�", dataTypeClass = String.class),
@ApiImplicitParam(name = "stream", value = "娴両D", dataTypeClass = String.class),
})
- @RequestMapping(value = "/start")
+ @GetMapping(value = "/start")
@ResponseBody
public Object start(String app, String stream){
logger.info("鍚敤浠ｇ悊锛� " + app + "/" + stream);
boolean result = streamProxyService.start(app, stream);
- return "success";
+ return result?"success":"fail";
}
@ApiOperation("鍋滅敤浠ｇ悊")
@@ -94,11 +139,11 @@
@ApiImplicitParam(name = "app", value = "搴旂敤鍚�", dataTypeClass = String.class),
@ApiImplicitParam(name = "stream", value = "娴両D", dataTypeClass = String.class),
})
- @RequestMapping(value = "/stop")
+ @GetMapping(value = "/stop")
@ResponseBody
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