From 77bf85342b9d5a7954c85f05a54e6a46d41f0bf6 Mon Sep 17 00:00:00 2001 From: 648540858 <18010473990@163.com> Date: 星期四, 02 九月 2021 15:10:47 +0800 Subject: [PATCH] 更新docker,更新readme --- src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 0 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 82632d8..3bfa595 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 @@ -1,19 +1,34 @@ package com.genersoft.iot.vmp.vmanager.server; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.genersoft.iot.vmp.VManageBootstrap; +import com.genersoft.iot.vmp.common.VersionPo; +import com.genersoft.iot.vmp.conf.SipConfig; +import com.genersoft.iot.vmp.conf.UserSetup; +import com.genersoft.iot.vmp.conf.VersionInfo; +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 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 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.web.bind.annotation.*; import javax.sip.ListeningPoint; import javax.sip.ObjectInUseException; import javax.sip.SipProvider; import java.util.Iterator; +import java.util.List; +@SuppressWarnings("rawtypes") @Api(tags = "鏈嶅姟鎺у埗") @CrossOrigin @RestController @@ -23,6 +38,54 @@ @Autowired private ConfigurableApplicationContext context; + @Autowired + private IMediaServerService mediaServerService; + + @Autowired + VersionInfo versionInfo; + + @Autowired + SipConfig sipConfig; + + @Autowired + UserSetup userSetup; + + @Value("${server.port}") + private int serverPort; + + + @ApiOperation("娴佸獟浣撴湇鍔″垪琛�") + @GetMapping(value = "/media_server/list") + @ResponseBody + public WVPResult<List<MediaServerItem>> getMediaServerList(){ + WVPResult<List<MediaServerItem>> result = new WVPResult<>(); + result.setCode(0); + result.setMsg("success"); + result.setData(mediaServerService.getAll()); + return result; + } + + @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; + } + + @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; + } @ApiOperation("閲嶅惎鏈嶅姟") @GetMapping(value = "/restart") @@ -56,4 +119,45 @@ restartThread.start(); return "success"; } + + @ApiOperation("鐗堟湰淇℃伅") + @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; + } + + @ApiOperation("閰嶇疆淇℃伅") + @GetMapping(value = "/config") + @ApiImplicitParams({ + @ApiImplicitParam(name="type", value = "閰嶇疆绫诲瀷锛坰ip, base锛�", dataTypeClass = String.class), + }) + @ResponseBody + public WVPResult<JSONObject> getVersion(String type){ + WVPResult<JSONObject> result = new WVPResult<>(); + result.setCode(0); + result.setMsg("success"); + + JSONObject jsonObject = new JSONObject(); + jsonObject.put("server.port", serverPort); + if (StringUtils.isEmpty(type)) { + jsonObject.put("sip", JSON.toJSON(sipConfig)); + jsonObject.put("base", JSON.toJSON(userSetup)); + }else { + switch (type){ + case "sip": + jsonObject.put("sip", sipConfig); + break; + case "base": + jsonObject.put("base", userSetup); + break; + } + } + result.setData(jsonObject); + return result; + } } -- Gitblit v1.8.0