From f4aa3e0ee8c988c0d7535ad1c76e68e23e400194 Mon Sep 17 00:00:00 2001 From: 648540858 <18010473990@163.com> Date: 星期日, 08 八月 2021 09:18:45 +0800 Subject: [PATCH] 修复自动点播 --- src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 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..76ad86c 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,7 +1,10 @@ package com.genersoft.iot.vmp.vmanager.server; import com.genersoft.iot.vmp.VManageBootstrap; +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.ApiOperation; @@ -13,7 +16,9 @@ import javax.sip.ObjectInUseException; import javax.sip.SipProvider; import java.util.Iterator; +import java.util.List; +@SuppressWarnings("rawtypes") @Api(tags = "鏈嶅姟鎺у埗") @CrossOrigin @RestController @@ -23,6 +28,42 @@ @Autowired private ConfigurableApplicationContext context; + @Autowired + private IMediaServerService mediaServerService; + + + @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") -- Gitblit v1.8.0