From 2e98b20bea4463e4465e3c19059d0744a09aec06 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 27 Jun 2023 14:34:41 +0800
Subject: [PATCH] gb28181版本升级-补充
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java | 128 ++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 67 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 860f6a3..b6e19d2 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
@@ -1,22 +1,24 @@
package com.genersoft.iot.vmp.vmanager.gb28181.MobilePosition;
+import java.text.ParseException;
import java.util.List;
import java.util.UUID;
-import javax.sip.message.Response;
-
+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;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+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;
-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;
@@ -30,10 +32,13 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.async.DeferredResult;
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+
/**
* 位置信息管理
*/
-@Api(tags = "位置信息管理")
+@Tag(name = "位置信息管理")
@CrossOrigin
@RestController
@RequestMapping("/api/position")
@@ -42,7 +47,7 @@
private final static Logger logger = LoggerFactory.getLogger(MobilePositionController.class);
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private SIPCommander cmder;
@@ -50,26 +55,29 @@
@Autowired
private DeferredResultHolder resultHolder;
+ @Autowired
+ private IDeviceService deviceService;
+
/**
- * 查询历史轨迹
+ * 查询历史轨迹
* @param deviceId 设备ID
+ * @param type 类型 0：警车 2：手台 3：执法记录仪
* @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),
- })
+ @Operation(summary = "查询历史轨迹")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "channelId", description = "通道国标编号")
+ @Parameter(name = "type", description = "类型")
+ @Parameter(name = "start", description = "开始时间")
+ @Parameter(name = "end", description = "结束时间")
@GetMapping("/history/{deviceId}")
- public ResponseEntity<List<MobilePosition>> positions(@PathVariable String deviceId,
- @RequestParam(required = false) String start,
- @RequestParam(required = false) String end) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("查询设备" + deviceId + "的历史轨迹");
-// }
+ public List<MobilePosition> positions(@PathVariable String deviceId,
+ @RequestParam(required = false) String channelId,
+ @RequestParam(required = false) String type,
+ @RequestParam(required = false) String start,
+ @RequestParam(required = false) String end) {
if (StringUtil.isEmpty(start)) {
start = null;
@@ -77,9 +85,7 @@
if (StringUtil.isEmpty(end)) {
end = null;
}
-
- List<MobilePosition> result = storager.queryMobilePositions(deviceId, start, end);
- return new ResponseEntity<>(result, HttpStatus.OK);
+ return storager.queryMobilePositions(deviceId, channelId,type, start, end);
}
/**
@@ -87,17 +93,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);
}
/**
@@ -105,23 +105,26 @@
* @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;
- cmder.mobilePostitionQuery(device, event -> {
- RequestMessage msg = new RequestMessage();
- msg.setId(uuid);
- msg.setKey(key);
- msg.setData(String.format("获取移动位置信息失败，错误码： %s, %s", event.statusCode, event.msg));
- resultHolder.invokeResult(msg);
- });
- DeferredResult<ResponseEntity<MobilePosition>> result = new DeferredResult<ResponseEntity<MobilePosition>>(5*1000L);
+ try {
+ cmder.mobilePostitionQuery(device, event -> {
+ RequestMessage msg = new RequestMessage();
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData(String.format("获取移动位置信息失败，错误码： %s, %s", event.statusCode, event.msg));
+ resultHolder.invokeResult(msg);
+ });
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[命令发送失败] 获取移动位置信息: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
+ }
+ DeferredResult<MobilePosition> result = new DeferredResult<MobilePosition>(5*1000L);
result.onTimeout(()->{
logger.warn(String.format("获取移动位置信息超时"));
// 释放rtpserver
@@ -142,33 +145,24 @@
* @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 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";
}
Device device = storager.queryVideoDevice(deviceId);
-
- String result = msg;
- if (cmder.mobilePositionSubscribe(device, Integer.parseInt(expires), Integer.parseInt(interval))) {
- result += "，成功";
- } else {
- result += "，失败";
+ device.setSubscribeCycleForMobilePosition(Integer.parseInt(expires));
+ device.setMobilePositionSubmissionInterval(Integer.parseInt(interval));
+ deviceService.updateDevice(device);
+ if (!deviceService.removeMobilePositionSubscribe(device)) {
+ throw new ControllerException(ErrorCode.ERROR100);
}
-
- return new ResponseEntity<>(result, HttpStatus.OK);
}
}
--
Gitblit v1.9.3