From 7dc8fd4a1e8c5afb6fad53454935419c239838c0 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 01 四月 2021 18:06:21 +0800
Subject: [PATCH] 添加拉流代理与国标关联, 支持代理rtsp/rtmp/...，转发到国标
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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..95b83ef 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,8 +1,7 @@
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.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.vmanager.service.IStreamProxyService;
import com.github.pagehelper.PageInfo;
@@ -31,17 +30,17 @@
@RequestMapping(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 q,
+ @RequestParam(required = false)Boolean online ){
return streamProxyService.getAll(page, count);
}
@RequestMapping(value = "/save")
@ResponseBody
- public Object save(@RequestBody StreamProxyDto param){
+ public Object save(@RequestBody StreamProxyItem param){
logger.info("娣诲姞浠ｇ悊锛� " + JSONObject.toJSONString(param));
streamProxyService.save(param);
return "success";
--
Gitblit v1.8.0