From 625842fd0d53909066b37febcbe5d12ae53635ed Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期日, 10 一月 2021 21:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
index ee77f01..0823c49 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
@@ -1,10 +1,13 @@
package com.genersoft.iot.vmp.vmanager.platform;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;
+import com.genersoft.iot.vmp.vmanager.platform.bean.UpdateChannelParam;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -14,6 +17,9 @@
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import com.genersoft.iot.vmp.conf.SipConfig;
+
+import java.util.List;
+import java.util.Map;
@CrossOrigin
@@ -142,5 +148,34 @@
return new ResponseEntity<>(String.valueOf(parentPlatform != null), HttpStatus.OK);
}
+ @RequestMapping("/platforms/channelList")
+ @ResponseBody
+ public PageInfo<ChannelReduce> channelList(int page, int count,
+ @RequestParam(required = false) String query,
+ @RequestParam(required = false) Boolean online,
+ @RequestParam(required = false) Boolean channelType){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("鏌ヨ鎵�鏈夋墍鏈夐�氶亾API璋冪敤");
+ }
+
+ PageInfo<ChannelReduce> channelReduces = storager.queryChannelListInAll(page, count, query, online, channelType, null);
+
+ return channelReduces;
+ }
+
+
+ @RequestMapping("/platforms/updateChannelForGB")
+ @ResponseBody
+ public ResponseEntity<String> updateChannelForGB(@RequestBody UpdateChannelParam param){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("缁欎笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾API璋冪敤");
+ }
+ int result = storager.updateChannelForGB(param.getPlatformId(), param.getChannelReduces());
+
+ return new ResponseEntity<>(String.valueOf(result > 0), HttpStatus.OK);
+ }
+
}
--
Gitblit v1.8.0