From b37a77f23f995758178b6af38b89a860107d218d Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 25 三月 2021 16:45:29 +0800
Subject: [PATCH] 解决循环依赖导致的打包失败
---
src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 156 insertions(+), 9 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..279a031 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,17 +1,21 @@
package com.genersoft.iot.vmp.vmanager.platform;
-import com.genersoft.iot.vmp.common.PageResult;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
+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.device.DeviceController;
+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;
import org.springframework.beans.factory.annotation.Autowired;
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 +27,27 @@
@Autowired
private IVideoManagerStorager storager;
- @GetMapping("/platforms")
- public PageResult<ParentPlatform> platforms(int page, int count){
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
+
+ @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 PageInfo<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count){
if (logger.isDebugEnabled()) {
logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
@@ -32,17 +55,141 @@
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璋冪敤");
+ logger.debug("淇濆瓨涓婄骇骞冲彴淇℃伅API璋冪敤");
}
+ 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 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦�,涓旀敞鍐屾垚鍔�, 濡傛灉娉ㄥ唽鎴愬姛,闇�瑕佸厛娉ㄩ攢涔嬪墠鍐�,淇敼骞舵敞鍐�
+
+ // ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId());
+ ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getServerGBId());
+
boolean updateResult = storager.updateParentPlatform(parentPlatform);
+
if (updateResult) {
+ // 淇濆瓨鏃跺惎鐢ㄥ氨鍙戦�佹敞鍐�
+ if (parentPlatform.isEnable()) {
+ // 鍙淇濆瓨灏卞彂閫佹敞鍐�
+ commanderForPlatform.register(parentPlatform);
+ } else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()){ // 鍏抽棴鍚敤鏃舵敞閿�
+ commanderForPlatform.unregister(parentPlatform, 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("鍒犻櫎涓婄骇骞冲彴API璋冪敤");
+ }
+ if (StringUtils.isEmpty(parentPlatform.getServerGBId())
+ ){
+ return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
+ }
+
+ // 鍙戦�佺绾挎秷鎭�,鏃犺鏄惁鎴愬姛閮藉垹闄ょ紦瀛�
+ commanderForPlatform.unregister(parentPlatform, (event -> {
+ // 娓呯┖redis缂撳瓨
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
+ }), (event -> {
+ // 娓呯┖redis缂撳瓨
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
+ }));
+
+ 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("鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪API璋冪敤锛�" + deviceGbId);
+ }
+ ParentPlatform parentPlatform = storager.queryParentPlatById(deviceGbId);
+ 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 platformId,
+ @RequestParam(required = false) String query,
+ @RequestParam(required = false) Boolean online,
+ @RequestParam(required = false) Boolean choosed,
+ @RequestParam(required = false) Boolean channelType){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("鏌ヨ鎵�鏈夋墍鏈夐�氶亾API璋冪敤");
+ }
+ PageInfo<ChannelReduce> channelReduces = null;
+ if (platformId != null ) {
+ channelReduces = storager.queryAllChannelList(page, count, query, online, channelType, platformId, choosed);
+ }else {
+ channelReduces = storager.queryAllChannelList(page, count, query, online, channelType, null, false);
+ }
+
+ 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);
+ }
+
+ @RequestMapping("/platforms/delChannelForGB")
+ @ResponseBody
+ public ResponseEntity<String> delChannelForGB(@RequestBody UpdateChannelParam param){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("缁欎笂绾у钩鍙板垹闄ゅ浗鏍囬�氶亾API璋冪敤");
+ }
+ int result = storager.delChannelForGB(param.getPlatformId(), param.getChannelReduces());
+
+ return new ResponseEntity<>(String.valueOf(result > 0), HttpStatus.OK);
+ }
+
+
}
--
Gitblit v1.8.0