From 8b6449ce3ac8eb4a0f59f3a6e3974d9190dcd133 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 29 八月 2022 09:55:09 +0800
Subject: [PATCH] 升级版本号
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java | 77 ++++++++++++++------------------------
1 files changed, 29 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java
index 7d11b15..6b24f99 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java
@@ -13,10 +13,9 @@
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
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 io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +32,7 @@
/**
* 浣嶇疆淇℃伅绠＄悊
*/
-@Api(tags = "浣嶇疆淇℃伅绠＄悊")
+@Tag(name = "浣嶇疆淇℃伅绠＄悊")
@CrossOrigin
@RestController
@RequestMapping("/api/position")
@@ -54,26 +53,22 @@
private IDeviceService deviceService;
/**
- * 鏌ヨ鍘嗗彶杞ㄨ抗
+ * 鏌ヨ鍘嗗彶杞ㄨ抗
* @param deviceId 璁惧ID
* @param start 寮�濮嬫椂闂�
* @param end 缁撴潫鏃堕棿
* @return
*/
- @ApiOperation("鏌ヨ鍘嗗彶杞ㄨ抗")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "start", value = "寮�濮嬫椂闂�", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "end", value = "缁撴潫鏃堕棿", required = true, dataTypeClass = String.class),
- })
- @GetMapping("/history/{deviceId}/{channelId}")
- public ResponseEntity<WVPResult<List<MobilePosition>>> positions(@PathVariable String deviceId,
- @PathVariable String channelId,
+ @Operation(summary = "鏌ヨ鍘嗗彶杞ㄨ抗")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿")
+ @Parameter(name = "start", description = "寮�濮嬫椂闂�")
+ @Parameter(name = "end", description = "缁撴潫鏃堕棿")
+ @GetMapping("/history/{deviceId}")
+ public List<MobilePosition> positions(@PathVariable String deviceId,
+ @RequestParam(required = false) String channelId,
@RequestParam(required = false) String start,
@RequestParam(required = false) String end) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("鏌ヨ璁惧" + deviceId + "鐨勫巻鍙茶建杩�");
-// }
if (StringUtil.isEmpty(start)) {
start = null;
@@ -81,11 +76,7 @@
if (StringUtil.isEmpty(end)) {
end = null;
}
- WVPResult<List<MobilePosition>> wvpResult = new WVPResult<>();
- wvpResult.setCode(0);
- List<MobilePosition> result = storager.queryMobilePositions(deviceId, channelId, start, end);
- wvpResult.setData(result);
- return new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ return storager.queryMobilePositions(deviceId, channelId, start, end);
}
/**
@@ -93,17 +84,11 @@
* @param deviceId 璁惧ID
* @return
*/
- @ApiOperation("鏌ヨ璁惧鏈�鏂颁綅缃�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
- })
+ @Operation(summary = "鏌ヨ璁惧鏈�鏂颁綅缃�")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@GetMapping("/latest/{deviceId}")
- public ResponseEntity<MobilePosition> latestPosition(@PathVariable String deviceId) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("鏌ヨ璁惧" + deviceId + "鐨勬渶鏂颁綅缃�");
-// }
- MobilePosition result = storager.queryLatestPosition(deviceId);
- return new ResponseEntity<>(result, HttpStatus.OK);
+ public MobilePosition latestPosition(@PathVariable String deviceId) {
+ return storager.queryLatestPosition(deviceId);
}
/**
@@ -111,12 +96,10 @@
* @param deviceId 璁惧ID
* @return
*/
- @ApiOperation("鑾峰彇绉诲姩浣嶇疆淇℃伅")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
- })
+ @Operation(summary = "鑾峰彇绉诲姩浣嶇疆淇℃伅")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@GetMapping("/realtime/{deviceId}")
- public DeferredResult<ResponseEntity<MobilePosition>> realTimePosition(@PathVariable String deviceId) {
+ public DeferredResult<MobilePosition> realTimePosition(@PathVariable String deviceId) {
Device device = storager.queryVideoDevice(deviceId);
String uuid = UUID.randomUUID().toString();
String key = DeferredResultHolder.CALLBACK_CMD_MOBILEPOSITION + deviceId;
@@ -127,7 +110,7 @@
msg.setData(String.format("鑾峰彇绉诲姩浣嶇疆淇℃伅澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg));
resultHolder.invokeResult(msg);
});
- DeferredResult<ResponseEntity<MobilePosition>> result = new DeferredResult<ResponseEntity<MobilePosition>>(5*1000L);
+ DeferredResult<MobilePosition> result = new DeferredResult<MobilePosition>(5*1000L);
result.onTimeout(()->{
logger.warn(String.format("鑾峰彇绉诲姩浣嶇疆淇℃伅瓒呮椂"));
// 閲婃斁rtpserver
@@ -148,14 +131,12 @@
* @param interval 涓婃姤鏃堕棿闂撮殧
* @return true = 鍛戒护鍙戦�佹垚鍔�
*/
- @ApiOperation("璁㈤槄浣嶇疆淇℃伅")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "expires", value = "璁㈤槄瓒呮椂鏃堕棿", dataTypeClass = String.class),
- @ApiImplicitParam(name = "interval", value = "涓婃姤鏃堕棿闂撮殧", dataTypeClass = String.class),
- })
+ @Operation(summary = "璁㈤槄浣嶇疆淇℃伅")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "expires", description = "璁㈤槄瓒呮椂鏃堕棿", required = true)
+ @Parameter(name = "interval", description = "涓婃姤鏃堕棿闂撮殧", required = true)
@GetMapping("/subscribe/{deviceId}")
- public ResponseEntity<String> positionSubscribe(@PathVariable String deviceId,
+ public String positionSubscribe(@PathVariable String deviceId,
@RequestParam String expires,
@RequestParam String interval) {
String msg = ((expires.equals("0")) ? "鍙栨秷" : "") + "璁㈤槄璁惧" + deviceId + "鐨勭Щ鍔ㄤ綅缃�";
@@ -169,7 +150,7 @@
Device device = storager.queryVideoDevice(deviceId);
device.setSubscribeCycleForMobilePosition(Integer.parseInt(expires));
device.setMobilePositionSubmissionInterval(Integer.parseInt(interval));
- storager.updateDevice(device);
+ deviceService.updateDevice(device);
String result = msg;
if (deviceService.removeMobilePositionSubscribe(device)) {
result += "锛屾垚鍔�";
@@ -177,6 +158,6 @@
result += "锛屽け璐�";
}
- return new ResponseEntity<>(result, HttpStatus.OK);
+ return result;
}
}
--
Gitblit v1.8.0