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/MobilePosition/MobilePositionController.java | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/MobilePosition/MobilePositionController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/MobilePosition/MobilePositionController.java
index 92806b1..c284fe9 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/MobilePosition/MobilePositionController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/MobilePosition/MobilePositionController.java
@@ -12,6 +12,10 @@
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.github.pagehelper.util.StringUtil;
+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;
@@ -25,9 +29,13 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.async.DeferredResult;
+/**
+ * 浣嶇疆淇℃伅绠＄悊
+ */
+@Api(tags = "浣嶇疆淇℃伅绠＄悊")
@CrossOrigin
@RestController
-@RequestMapping("/api")
+@RequestMapping("/api/position")
public class MobilePositionController {
private final static Logger logger = LoggerFactory.getLogger(MobilePositionController.class);
@@ -40,8 +48,21 @@
@Autowired
private DeferredResultHolder resultHolder;
-
- @GetMapping("/positions/{deviceId}/history")
+
+ /**
+ * 鏌ヨ鍘嗗彶杞ㄨ抗
+ * @param deviceId 璁惧ID
+ * @param start 寮�濮嬫椂闂�
+ * @param end 缁撴潫鏃堕棿
+ * @return
+ */
+ @ApiOperation("鏌ヨ鍘嗗彶杞ㄨ抗")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true),
+ @ApiImplicitParam(name = "start", value = "寮�濮嬫椂闂�", required = true),
+ @ApiImplicitParam(name = "end", value = "缁撴潫鏃堕棿", required = true),
+ })
+ @GetMapping("/history/{deviceId}")
public ResponseEntity<List<MobilePosition>> positions(@PathVariable String deviceId,
@RequestParam(required = false) String start,
@RequestParam(required = false) String end) {
@@ -60,7 +81,16 @@
return new ResponseEntity<>(result, HttpStatus.OK);
}
- @GetMapping("/positions/{deviceId}/latest")
+ /**
+ * 鏌ヨ璁惧鏈�鏂颁綅缃�
+ * @param deviceId 璁惧ID
+ * @return
+ */
+ @ApiOperation("鏌ヨ璁惧鏈�鏂颁綅缃�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true),
+ })
+ @GetMapping("/latest/{deviceId}")
public ResponseEntity<MobilePosition> latestPosition(@PathVariable String deviceId) {
if (logger.isDebugEnabled()) {
logger.debug("鏌ヨ璁惧" + deviceId + "鐨勬渶鏂颁綅缃�");
@@ -69,7 +99,16 @@
return new ResponseEntity<>(result, HttpStatus.OK);
}
- @GetMapping("/positions/{deviceId}/realtime")
+ /**
+ * 鑾峰彇绉诲姩浣嶇疆淇℃伅
+ * @param deviceId 璁惧ID
+ * @return
+ */
+ @ApiOperation("鑾峰彇绉诲姩浣嶇疆淇℃伅")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true),
+ })
+ @GetMapping("/realtime/{deviceId}")
public DeferredResult<ResponseEntity<MobilePosition>> realTimePosition(@PathVariable String deviceId) {
Device device = storager.queryVideoDevice(deviceId);
cmder.mobilePostitionQuery(device, event -> {
@@ -92,7 +131,20 @@
return result;
}
- @GetMapping("/positions/{deviceId}/subscribe")
+ /**
+ * 璁㈤槄浣嶇疆淇℃伅
+ * @param deviceId 璁惧ID
+ * @param expires 璁㈤槄瓒呮椂鏃堕棿
+ * @param interval 涓婃姤鏃堕棿闂撮殧
+ * @return true = 鍛戒护鍙戦�佹垚鍔�
+ */
+ @ApiOperation("璁㈤槄浣嶇疆淇℃伅")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true),
+ @ApiImplicitParam(name = "expires", value = "璁㈤槄瓒呮椂鏃堕棿"),
+ @ApiImplicitParam(name = "interval", value = "涓婃姤鏃堕棿闂撮殧"),
+ })
+ @GetMapping("/subscribe/{deviceId}")
public ResponseEntity<String> positionSubscribe(@PathVariable String deviceId,
@RequestParam String expires,
@RequestParam String interval) {
--
Gitblit v1.8.0