From 89244932c6185cd39e9a9f8aa8bf3acf99329335 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期日, 11 四月 2021 15:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 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 279a031..834c00b 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
@@ -8,6 +8,7 @@
import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;
import com.genersoft.iot.vmp.vmanager.platform.bean.UpdateChannelParam;
import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,9 +18,13 @@
import org.springframework.web.bind.annotation.*;
import com.genersoft.iot.vmp.conf.SipConfig;
+/**
+ * 绾ц仈骞冲彴绠＄悊
+ */
+@Api("绾ц仈骞冲彴绠＄悊")
@CrossOrigin
@RestController
-@RequestMapping("/api")
+@RequestMapping("/api/platform")
public class PlatformController {
private final static Logger logger = LoggerFactory.getLogger(PlatformController.class);
@@ -36,7 +41,7 @@
@Autowired
private SipConfig sipConfig;
- @GetMapping("/platforms/serverconfig")
+ @GetMapping("/server_config")
public ResponseEntity<JSONObject> serverConfig() {
JSONObject result = new JSONObject();
result.put("deviceIp", sipConfig.getSipIp());
@@ -46,7 +51,7 @@
return new ResponseEntity<>(result, HttpStatus.OK);
}
- @GetMapping("/platforms/{count}/{page}")
+ @GetMapping("/query/{count}/{page}")
public PageInfo<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count){
if (logger.isDebugEnabled()) {
@@ -55,7 +60,7 @@
return storager.queryParentPlatformList(page, count);
}
- @RequestMapping("/platforms/save")
+ @PostMapping("/save")
@ResponseBody
public ResponseEntity<String> savePlatform(@RequestBody ParentPlatform parentPlatform){
@@ -98,18 +103,19 @@
}
}
- @RequestMapping("/platforms/delete")
+ @DeleteMapping("/delete/{serverGBId}")
@ResponseBody
- public ResponseEntity<String> deletePlatform(@RequestBody ParentPlatform parentPlatform){
+ public ResponseEntity<String> deletePlatform(@PathVariable String serverGBId){
if (logger.isDebugEnabled()) {
logger.debug("鍒犻櫎涓婄骇骞冲彴API璋冪敤");
}
- if (StringUtils.isEmpty(parentPlatform.getServerGBId())
+ if (StringUtils.isEmpty(serverGBId)
){
return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
}
-
+ ParentPlatform parentPlatform = storager.queryParentPlatById(serverGBId);
+ if (parentPlatform == null) return new ResponseEntity<>("fail", HttpStatus.OK);
// 鍙戦�佺绾挎秷鎭�,鏃犺鏄惁鎴愬姛閮藉垹闄ょ紦瀛�
commanderForPlatform.unregister(parentPlatform, (event -> {
// 娓呯┖redis缂撳瓨
@@ -133,7 +139,7 @@
}
}
- @RequestMapping("/platforms/exit/{deviceGbId}")
+ @GetMapping("/exit/{deviceGbId}")
@ResponseBody
public ResponseEntity<String> exitPlatform(@PathVariable String deviceGbId){
@@ -144,7 +150,7 @@
return new ResponseEntity<>(String.valueOf(parentPlatform != null), HttpStatus.OK);
}
- @RequestMapping("/platforms/channelList")
+ @GetMapping("/channel_list")
@ResponseBody
public PageInfo<ChannelReduce> channelList(int page, int count,
@RequestParam(required = false) String platformId,
@@ -167,7 +173,7 @@
}
- @RequestMapping("/platforms/updateChannelForGB")
+ @PostMapping("/update_channel_for_gb")
@ResponseBody
public ResponseEntity<String> updateChannelForGB(@RequestBody UpdateChannelParam param){
@@ -179,7 +185,7 @@
return new ResponseEntity<>(String.valueOf(result > 0), HttpStatus.OK);
}
- @RequestMapping("/platforms/delChannelForGB")
+ @DeleteMapping("/del_channel_for_gb")
@ResponseBody
public ResponseEntity<String> delChannelForGB(@RequestBody UpdateChannelParam param){
--
Gitblit v1.8.0