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/device/DeviceConfig.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceConfig.java b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceConfig.java
index d046c0d..a988550 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceConfig.java
@@ -17,16 +17,22 @@
import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpRequest;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
+@Api(tags = "鍥芥爣璁惧閰嶇疆")
@CrossOrigin
@RestController
-@RequestMapping("/api")
+@RequestMapping("/api/device/config")
public class DeviceConfig {
private final static Logger logger = LoggerFactory.getLogger(DeviceQuery.class);
@@ -42,14 +48,24 @@
/**
* 鐪嬪畧浣嶆帶鍒跺懡浠PI鎺ュ彛
- *
- * @param deviceId
- * @param enabled 鐪嬪畧浣嶄娇鑳�1:寮�鍚�,0:鍏抽棴
- * @param resetTime 鑷姩褰掍綅鏃堕棿闂撮殧锛堝彲閫夛級
- * @param presetIndex 璋冪敤棰勭疆浣嶇紪鍙凤紙鍙�夛級
- * @param channelId 閫氶亾缂栫爜锛堝彲閫夛級
+ * @param deviceId 璁惧ID
+ * @param channelId 閫氶亾ID
+ * @param name 鍚嶇О
+ * @param expiration 鍒版湡鏃堕棿
+ * @param heartBeatInterval 蹇冭烦闂撮殧
+ * @param heartBeatCount 蹇冭烦璁℃暟
+ * @return
*/
- @GetMapping("/config/{deviceId}/basicParam")
+ @ApiOperation("鐪嬪畧浣嶆帶鍒跺懡浠�")
+ @GetMapping("/basicParam/{deviceId}")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "deviceId", value ="璁惧ID" ),
+ @ApiImplicitParam(name = "channelId", value ="閫氶亾ID" ),
+ @ApiImplicitParam(name = "name", value ="鍚嶇О" ),
+ @ApiImplicitParam(name = "expiration", value ="鍒版湡鏃堕棿" ),
+ @ApiImplicitParam(name = "heartBeatInterval", value ="蹇冭烦闂撮殧" ),
+ @ApiImplicitParam(name = "heartBeatCount", value ="蹇冭烦璁℃暟" ),
+ })
public DeferredResult<ResponseEntity<String>> homePositionApi(@PathVariable String deviceId,
@RequestParam(required = false) String channelId,
@RequestParam(required = false) String name,
@@ -86,10 +102,18 @@
/**
* 璁惧閰嶇疆鏌ヨ璇锋眰API鎺ュ彛
- *
- * @param deviceId
+ * @param deviceId 璁惧ID
+ * @param configType 閰嶇疆绫诲瀷
+ * @param channelId 閫氶亾ID
+ * @return
*/
- @GetMapping("/config/{deviceId}/query/{configType}")
+ @ApiOperation("璁惧閰嶇疆鏌ヨ璇锋眰")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "deviceId", value ="璁惧ID" ),
+ @ApiImplicitParam(name = "channelId", value ="閫氶亾ID" ),
+ @ApiImplicitParam(name = "configType", value ="閰嶇疆绫诲瀷" ),
+ })
+ @GetMapping("/query/{deviceId}/{configType}")
public DeferredResult<ResponseEntity<String>> configDownloadApi(@PathVariable String deviceId,
@PathVariable String configType,
@RequestParam(required = false) String channelId) {
--
Gitblit v1.8.0