From ed1fe4b9388cfa9c1cf691f840afceddce8c7bfd Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期四, 17 十二月 2020 15:42:29 +0800
Subject: [PATCH] 与主线同步，修复zlm在docker时代理错误
---
src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java | 81 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 77 insertions(+), 4 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 9f35dd8..a94685e 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,8 +1,11 @@
package com.genersoft.iot.vmp.vmanager.platform;
+import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.PageResult;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.vmanager.device.DeviceController;
import org.slf4j.Logger;
@@ -11,7 +14,10 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import com.genersoft.iot.vmp.conf.SipConfig;
+
@CrossOrigin
@RestController
@@ -23,8 +29,24 @@
@Autowired
private IVideoManagerStorager storager;
- @GetMapping("/platforms")
- public PageResult<ParentPlatform> platforms(int page, int count){
+ @Autowired
+ private ISIPCommanderForPlatform commanderForPlatform;
+
+ @Autowired
+ private SipConfig sipConfig;
+
+ @GetMapping("/platforms/serverconfig")
+ public ResponseEntity<JSONObject> serverConfig() {
+ JSONObject result = new JSONObject();
+ result.put("deviceIp", sipConfig.getSipIp());
+ result.put("devicePort", sipConfig.getSipPort());
+ result.put("username", sipConfig.getSipId());
+ result.put("password", sipConfig.getSipPassword());
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
+
+ @GetMapping("/platforms/{count}/{page}")
+ public PageResult<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count){
if (logger.isDebugEnabled()) {
logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
@@ -32,17 +54,68 @@
return storager.queryParentPlatformList(page, count);
}
- @PostMapping("/platforms/add")
- public ResponseEntity<String> addPlatform(ParentPlatform parentPlatform){
+ @RequestMapping("/platforms/save")
+ @ResponseBody
+ public ResponseEntity<String> savePlatform(@RequestBody ParentPlatform parentPlatform){
if (logger.isDebugEnabled()) {
logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
}
+ if (StringUtils.isEmpty(parentPlatform.getName())
+ ||StringUtils.isEmpty(parentPlatform.getServerGBId())
+ ||StringUtils.isEmpty(parentPlatform.getServerGBDomain())
+ ||StringUtils.isEmpty(parentPlatform.getServerIP())
+ ||StringUtils.isEmpty(parentPlatform.getServerPort())
+ ||StringUtils.isEmpty(parentPlatform.getDeviceGBId())
+ ||StringUtils.isEmpty(parentPlatform.getExpires())
+ ||StringUtils.isEmpty(parentPlatform.getKeepTimeout())
+ ||StringUtils.isEmpty(parentPlatform.getTransport())
+ ||StringUtils.isEmpty(parentPlatform.getCharacterSet())
+ ){
+ return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
+ }
+ // TODO 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦�,涓旀敞鍐屾垚鍔�, 濡傛灉娉ㄥ唽鎴愬姛,闇�瑕佸厛娉ㄩ攢涔嬪墠鍐�,淇敼骞舵敞鍐�
+
boolean updateResult = storager.updateParentPlatform(parentPlatform);
+
if (updateResult) {
+ commanderForPlatform.register(parentPlatform, null, null, null, null);
+
return new ResponseEntity<>("success", HttpStatus.OK);
}else {
return new ResponseEntity<>("fail", HttpStatus.OK);
}
}
+
+ @RequestMapping("/platforms/delete")
+ @ResponseBody
+ public ResponseEntity<String> deletePlatform(@RequestBody ParentPlatform parentPlatform){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
+ }
+ if (StringUtils.isEmpty(parentPlatform.getDeviceGBId())
+ ){
+ return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
+ }
+ boolean deleteResult = storager.deleteParentPlatform(parentPlatform);
+ if (deleteResult) {
+ return new ResponseEntity<>("success", HttpStatus.OK);
+ }else {
+ return new ResponseEntity<>("fail", HttpStatus.OK);
+ }
+ }
+
+ @RequestMapping("/platforms/exit/{deviceGbId}")
+ @ResponseBody
+ public ResponseEntity<String> exitPlatform(@PathVariable String deviceGbId){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
+ }
+ ParentPlatform parentPlatform = storager.queryParentPlatById(deviceGbId);
+ return new ResponseEntity<>(String.valueOf(parentPlatform != null), HttpStatus.OK);
+ }
+
+
}
--
Gitblit v1.8.0