From e09e541c827157884e013ff0b50aa88b8b0f46be Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 15 一月 2021 17:47:58 +0800
Subject: [PATCH] 完成向上级联->点播--精简代码
---
src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 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 0823c49..ca116d5 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
@@ -82,7 +82,8 @@
}
// TODO 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦�,涓旀敞鍐屾垚鍔�, 濡傛灉娉ㄥ唽鎴愬姛,闇�瑕佸厛娉ㄩ攢涔嬪墠鍐�,淇敼骞舵敞鍐�
- ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId());
+ // ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId());
+ ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getServerGBId());
boolean updateResult = storager.updateParentPlatform(parentPlatform);
@@ -109,7 +110,7 @@
if (logger.isDebugEnabled()) {
logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
}
- if (StringUtils.isEmpty(parentPlatform.getDeviceGBId())
+ if (StringUtils.isEmpty(parentPlatform.getServerGBId())
){
return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
}
@@ -117,14 +118,14 @@
// 鍙戦�佺绾挎秷鎭�,鏃犺鏄惁鎴愬姛閮藉垹闄ょ紦瀛�
commanderForPlatform.unregister(parentPlatform, (event -> {
// 娓呯┖redis缂撳瓨
- redisCatchStorage.delPlatformCatchInfo(parentPlatform.getDeviceGBId());
- redisCatchStorage.delPlatformKeepalive(parentPlatform.getDeviceGBId());
- redisCatchStorage.delPlatformRegister(parentPlatform.getDeviceGBId());
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
}), (event -> {
// 娓呯┖redis缂撳瓨
- redisCatchStorage.delPlatformCatchInfo(parentPlatform.getDeviceGBId());
- redisCatchStorage.delPlatformKeepalive(parentPlatform.getDeviceGBId());
- redisCatchStorage.delPlatformRegister(parentPlatform.getDeviceGBId());
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
}));
boolean deleteResult = storager.deleteParentPlatform(parentPlatform);
@@ -151,15 +152,21 @@
@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 = storager.queryChannelListInAll(page, count, query, online, channelType, null);
+ 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;
}
@@ -177,5 +184,17 @@
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