From 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:18:49 +0800
Subject: [PATCH] Merge pull request #645 from IKangXu/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 262 ++++++++++++++++-----------------------------------
1 files changed, 83 insertions(+), 179 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
index 2311d4b..2884734 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
@@ -4,25 +4,25 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.VManageBootstrap;
import com.genersoft.iot.vmp.common.VersionPo;
-import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.VersionInfo;
-import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.IHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.utils.SpringBeanFactory;
-import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import gov.nist.javax.sip.SipStackImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.util.StringUtils;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import javax.sip.ListeningPoint;
@@ -30,17 +30,16 @@
import javax.sip.SipProvider;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
@SuppressWarnings("rawtypes")
-@Api(tags = "鏈嶅姟鎺у埗")
+@Tag(name = "鏈嶅姟鎺у埗")
@CrossOrigin
@RestController
@RequestMapping("/api/server")
public class ServerController {
@Autowired
- private ZLMHttpHookSubscribe zlmHttpHookSubscribe;
+ private ZlmHttpHookSubscribe zlmHttpHookSubscribe;
@Autowired
private IMediaServerService mediaServerService;
@@ -54,194 +53,136 @@
@Autowired
private UserSetting userSetting;
- @Autowired
- private DynamicTask dynamicTask;
-
@Value("${server.port}")
private int serverPort;
- @ApiOperation("娴佸獟浣撴湇鍔″垪琛�")
+ @Autowired
+ private ThreadPoolTaskExecutor taskExecutor;
+
+
@GetMapping(value = "/media_server/list")
@ResponseBody
- public WVPResult<List<MediaServerItem>> getMediaServerList(boolean detail){
- WVPResult<List<MediaServerItem>> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
- result.setData(mediaServerService.getAll());
- return result;
+ @Operation(summary = "娴佸獟浣撴湇鍔″垪琛�")
+ public List<MediaServerItem> getMediaServerList() {
+ return mediaServerService.getAll();
}
- @ApiOperation("鍦ㄧ嚎娴佸獟浣撴湇鍔″垪琛�")
@GetMapping(value = "/media_server/online/list")
@ResponseBody
- public WVPResult<List<MediaServerItem>> getOnlineMediaServerList(){
- WVPResult<List<MediaServerItem>> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
- result.setData(mediaServerService.getAllOnline());
- return result;
+ @Operation(summary = "鍦ㄧ嚎娴佸獟浣撴湇鍔″垪琛�")
+ public List<MediaServerItem> getOnlineMediaServerList() {
+ return mediaServerService.getAllOnline();
}
- @ApiOperation("鑾峰彇娴佸獟浣撴湇鍔�")
@GetMapping(value = "/media_server/one/{id}")
@ResponseBody
- public WVPResult<MediaServerItem> getMediaServer(@PathVariable String id){
- WVPResult<MediaServerItem> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
- result.setData(mediaServerService.getOne(id));
- return result;
+ @Operation(summary = "鍋滄瑙嗛鍥炴斁")
+ @Parameter(name = "id", description = "娴佸獟浣撴湇鍔D", required = true)
+ public MediaServerItem getMediaServer(@PathVariable String id) {
+ return mediaServerService.getOne(id);
}
- @ApiOperation("娴嬭瘯娴佸獟浣撴湇鍔�")
- @ApiImplicitParams({
- @ApiImplicitParam(name="ip", value = "娴佸獟浣撴湇鍔P", dataTypeClass = String.class),
- @ApiImplicitParam(name="port", value = "娴佸獟浣撴湇鍔TT绔彛", dataTypeClass = Integer.class),
- @ApiImplicitParam(name="secret", value = "娴佸獟浣撴湇鍔ecret", dataTypeClass = String.class),
- })
+ @Operation(summary = "娴嬭瘯娴佸獟浣撴湇鍔�")
+ @Parameter(name = "ip", description = "娴佸獟浣撴湇鍔P", required = true)
+ @Parameter(name = "port", description = "娴佸獟浣撴湇鍔TT绔彛", required = true)
+ @Parameter(name = "secret", description = "娴佸獟浣撴湇鍔ecret", required = true)
@GetMapping(value = "/media_server/check")
@ResponseBody
- public WVPResult<MediaServerItem> checkMediaServer(@RequestParam String ip, @RequestParam int port, @RequestParam String secret){
+ public MediaServerItem checkMediaServer(@RequestParam String ip, @RequestParam int port, @RequestParam String secret) {
return mediaServerService.checkMediaServer(ip, port, secret);
}
- @ApiOperation("娴嬭瘯娴佸獟浣撳綍鍍忕鐞嗘湇鍔�")
- @ApiImplicitParams({
- @ApiImplicitParam(name="ip", value = "娴佸獟浣撴湇鍔P", dataTypeClass = String.class),
- @ApiImplicitParam(name="port", value = "娴佸獟浣撴湇鍔TT绔彛", dataTypeClass = Integer.class),
- @ApiImplicitParam(name="secret", value = "娴佸獟浣撴湇鍔ecret", dataTypeClass = String.class),
- })
+ @Operation(summary = "娴嬭瘯娴佸獟浣撳綍鍍忕鐞嗘湇鍔�")
+ @Parameter(name = "ip", description = "娴佸獟浣撴湇鍔P", required = true)
+ @Parameter(name = "port", description = "娴佸獟浣撴湇鍔TT绔彛", required = true)
@GetMapping(value = "/media_server/record/check")
@ResponseBody
- public WVPResult<String> checkMediaRecordServer(@RequestParam String ip, @RequestParam int port){
+ public void checkMediaRecordServer(@RequestParam String ip, @RequestParam int port) {
boolean checkResult = mediaServerService.checkMediaRecordServer(ip, port);
- WVPResult<String> result = new WVPResult<>();
- if (checkResult) {
- result.setCode(0);
- result.setMsg("success");
-
- }else {
- result.setCode(-1);
- result.setMsg("杩炴帴澶辫触");
+ if (!checkResult) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "杩炴帴澶辫触");
}
- return result;
}
- @ApiOperation("淇濆瓨娴佸獟浣撴湇鍔�")
- @ApiImplicitParams({
- @ApiImplicitParam(name="mediaServerItem", value = "娴佸獟浣撲俊鎭�", dataTypeClass = MediaServerItem.class)
- })
+ @Operation(summary = "淇濆瓨娴佸獟浣撴湇鍔�")
+ @Parameter(name = "mediaServerItem", description = "娴佸獟浣撲俊鎭�", required = true)
@PostMapping(value = "/media_server/save")
@ResponseBody
- public WVPResult<String> saveMediaServer(@RequestBody MediaServerItem mediaServerItem){
+ public void saveMediaServer(@RequestBody MediaServerItem mediaServerItem) {
MediaServerItem mediaServerItemInDatabase = mediaServerService.getOne(mediaServerItem.getId());
if (mediaServerItemInDatabase != null) {
- if (StringUtils.isEmpty(mediaServerItemInDatabase.getSendRtpPortRange())
- && StringUtils.isEmpty(mediaServerItem.getSendRtpPortRange())){
+ if (ObjectUtils.isEmpty(mediaServerItemInDatabase.getSendRtpPortRange()) && ObjectUtils.isEmpty(mediaServerItem.getSendRtpPortRange())) {
mediaServerItem.setSendRtpPortRange("30000,30500");
}
- mediaServerService.update(mediaServerItem);
- }else {
- if (StringUtils.isEmpty(mediaServerItem.getSendRtpPortRange())){
+ mediaServerService.update(mediaServerItem);
+ } else {
+ if (ObjectUtils.isEmpty(mediaServerItem.getSendRtpPortRange())) {
mediaServerItem.setSendRtpPortRange("30000,30500");
}
- return mediaServerService.add(mediaServerItem);
+ mediaServerService.add(mediaServerItem);
}
-
- WVPResult<String> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
- return result;
}
- @ApiOperation("绉婚櫎娴佸獟浣撴湇鍔�")
- @ApiImplicitParams({
- @ApiImplicitParam(name="id", value = "娴佸獟浣揑D", dataTypeClass = String.class)
- })
+ @Operation(summary = "绉婚櫎娴佸獟浣撴湇鍔�")
+ @Parameter(name = "id", description = "娴佸獟浣揑D", required = true)
@DeleteMapping(value = "/media_server/delete")
@ResponseBody
- public WVPResult<String> deleteMediaServer(@RequestParam String id){
- if (mediaServerService.getOne(id) != null) {
- mediaServerService.delete(id);
- mediaServerService.deleteDb(id);
- }else {
- WVPResult<String> result = new WVPResult<>();
- result.setCode(-1);
- result.setMsg("鏈壘鍒版鑺傜偣");
- return result;
+ public void deleteMediaServer(@RequestParam String id) {
+ if (mediaServerService.getOne(id) == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒版鑺傜偣");
}
- WVPResult<String> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
- return result;
+ mediaServerService.delete(id);
+ mediaServerService.deleteDb(id);
}
-
- @ApiOperation("閲嶅惎鏈嶅姟")
+ @Operation(summary = "閲嶅惎鏈嶅姟")
@GetMapping(value = "/restart")
@ResponseBody
- public Object restart(){
- Thread restartThread = new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- Thread.sleep(3000);
- SipProvider up = (SipProvider) SpringBeanFactory.getBean("udpSipProvider");
- SipStackImpl stack = (SipStackImpl)up.getSipStack();
- stack.stop();
- Iterator listener = stack.getListeningPoints();
- while (listener.hasNext()) {
- stack.deleteListeningPoint((ListeningPoint) listener.next());
- }
- Iterator providers = stack.getSipProviders();
- while (providers.hasNext()) {
- stack.deleteSipProvider((SipProvider) providers.next());
- }
- VManageBootstrap.restart();
- } catch (InterruptedException ignored) {
- } catch (ObjectInUseException e) {
- e.printStackTrace();
+ public void restart() {
+ taskExecutor.execute(()-> {
+ try {
+ Thread.sleep(3000);
+ SipProvider up = (SipProvider) SpringBeanFactory.getBean("udpSipProvider");
+ SipStackImpl stack = (SipStackImpl) up.getSipStack();
+ stack.stop();
+ Iterator listener = stack.getListeningPoints();
+ while (listener.hasNext()) {
+ stack.deleteListeningPoint((ListeningPoint) listener.next());
}
+ Iterator providers = stack.getSipProviders();
+ while (providers.hasNext()) {
+ stack.deleteSipProvider((SipProvider) providers.next());
+ }
+ VManageBootstrap.restart();
+ } catch (InterruptedException | ObjectInUseException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
}
});
+ };
- restartThread.setDaemon(false);
- restartThread.start();
- return "success";
- }
-
- @ApiOperation("鐗堟湰淇℃伅")
+ @Operation(summary = "鑾峰彇鐗堟湰淇℃伅")
@GetMapping(value = "/version")
@ResponseBody
- public WVPResult<VersionPo> getVersion(){
- WVPResult<VersionPo> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
- result.setData(versionInfo.getVersion());
- return result;
+ public VersionPo VersionPogetVersion() {
+ return versionInfo.getVersion();
}
- @ApiOperation("閰嶇疆淇℃伅")
@GetMapping(value = "/config")
- @ApiImplicitParams({
- @ApiImplicitParam(name="type", value = "閰嶇疆绫诲瀷锛坰ip, base锛�", dataTypeClass = String.class),
- })
+ @Operation(summary = "鑾峰彇閰嶇疆淇℃伅")
+ @Parameter(name = "type", description = "閰嶇疆绫诲瀷锛坰ip, base锛�", required = true)
@ResponseBody
- public WVPResult<JSONObject> getVersion(String type){
- WVPResult<JSONObject> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
+ public JSONObject getVersion(String type) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("server.port", serverPort);
- if (StringUtils.isEmpty(type)) {
+ if (ObjectUtils.isEmpty(type)) {
jsonObject.put("sip", JSON.toJSON(sipConfig));
jsonObject.put("base", JSON.toJSON(userSetting));
- }else {
- switch (type){
+ } else {
+ switch (type) {
case "sip":
jsonObject.put("sip", sipConfig);
break;
@@ -252,50 +193,13 @@
break;
}
}
- result.setData(jsonObject);
- return result;
+ return jsonObject;
}
- @ApiOperation("鑾峰彇褰撳墠鎵�鏈塰ook")
@GetMapping(value = "/hooks")
@ResponseBody
- public WVPResult<List<IHookSubscribe>> getHooks(){
- WVPResult<List<IHookSubscribe>> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
- List<IHookSubscribe> all = zlmHttpHookSubscribe.getAll();
- result.setData(all);
- return result;
+ @Operation(summary = "鑾峰彇褰撳墠鎵�鏈塰ook")
+ public List<IHookSubscribe> getHooks() {
+ return zlmHttpHookSubscribe.getAll();
}
-
-// @ApiOperation("褰撳墠杩涜涓殑鍔ㄦ�佷换鍔�")
-// @GetMapping(value = "/dynamicTask")
-// @ResponseBody
-// public WVPResult<JSONObject> getDynamicTask(){
-// WVPResult<JSONObject> result = new WVPResult<>();
-// result.setCode(0);
-// result.setMsg("success");
-//
-// JSONObject jsonObject = new JSONObject();
-//
-// Set<String> allKeys = dynamicTask.getAllKeys();
-// jsonObject.put("server.port", serverPort);
-// if (StringUtils.isEmpty(type)) {
-// jsonObject.put("sip", JSON.toJSON(sipConfig));
-// jsonObject.put("base", JSON.toJSON(userSetting));
-// }else {
-// switch (type){
-// case "sip":
-// jsonObject.put("sip", sipConfig);
-// break;
-// case "base":
-// jsonObject.put("base", userSetting);
-// break;
-// default:
-// break;
-// }
-// }
-// result.setData(jsonObject);
-// return result;
-// }
}
--
Gitblit v1.8.0