From 221f99c764b51c3cd284c6e5a41492c26c5c7ffc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 09 九月 2022 17:06:19 +0800
Subject: [PATCH] 优化sip消息
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 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 7bd4949..e5d928a 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
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.UUID;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
@@ -10,6 +11,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.util.StringUtil;
@@ -65,7 +67,7 @@
@Parameter(name = "start", description = "寮�濮嬫椂闂�")
@Parameter(name = "end", description = "缁撴潫鏃堕棿")
@GetMapping("/history/{deviceId}")
- public ResponseEntity<WVPResult<List<MobilePosition>>> positions(@PathVariable String deviceId,
+ public List<MobilePosition> positions(@PathVariable String deviceId,
@RequestParam(required = false) String channelId,
@RequestParam(required = false) String start,
@RequestParam(required = false) String end) {
@@ -76,11 +78,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);
}
/**
@@ -91,9 +89,8 @@
@Operation(summary = "鏌ヨ璁惧鏈�鏂颁綅缃�")
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@GetMapping("/latest/{deviceId}")
- public ResponseEntity<MobilePosition> latestPosition(@PathVariable String deviceId) {
- MobilePosition result = storager.queryLatestPosition(deviceId);
- return new ResponseEntity<>(result, HttpStatus.OK);
+ public MobilePosition latestPosition(@PathVariable String deviceId) {
+ return storager.queryLatestPosition(deviceId);
}
/**
@@ -104,7 +101,7 @@
@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;
@@ -115,7 +112,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
@@ -141,13 +138,9 @@
@Parameter(name = "expires", description = "璁㈤槄瓒呮椂鏃堕棿", required = true)
@Parameter(name = "interval", description = "涓婃姤鏃堕棿闂撮殧", required = true)
@GetMapping("/subscribe/{deviceId}")
- public ResponseEntity<String> positionSubscribe(@PathVariable String deviceId,
+ public void positionSubscribe(@PathVariable String deviceId,
@RequestParam String expires,
@RequestParam String interval) {
- String msg = ((expires.equals("0")) ? "鍙栨秷" : "") + "璁㈤槄璁惧" + deviceId + "鐨勭Щ鍔ㄤ綅缃�";
- if (logger.isDebugEnabled()) {
- logger.debug(msg);
- }
if (StringUtil.isEmpty(interval)) {
interval = "5";
@@ -156,13 +149,8 @@
device.setSubscribeCycleForMobilePosition(Integer.parseInt(expires));
device.setMobilePositionSubmissionInterval(Integer.parseInt(interval));
deviceService.updateDevice(device);
- String result = msg;
- if (deviceService.removeMobilePositionSubscribe(device)) {
- result += "锛屾垚鍔�";
- } else {
- result += "锛屽け璐�";
+ if (!deviceService.removeMobilePositionSubscribe(device)) {
+ throw new ControllerException(ErrorCode.ERROR100);
}
-
- return new ResponseEntity<>(result, HttpStatus.OK);
}
}
--
Gitblit v1.8.0