From 381c3bdc2079ece5147cf4cee004e9071edadf7a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 04 五月 2023 16:04:44 +0800
Subject: [PATCH] 修复国标点播下级平台，ssrc更新的时单端口错误更新rtpserver的问题
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java | 80 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 32 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 6b24f99..5046faa 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,39 +1,36 @@
package com.genersoft.iot.vmp.vmanager.gb28181.MobilePosition;
-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;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.service.IDeviceChannelService;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.github.pagehelper.util.StringUtil;
-
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;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
+import java.util.List;
+import java.util.UUID;
/**
* 浣嶇疆淇℃伅绠＄悊
*/
@Tag(name = "浣嶇疆淇℃伅绠＄悊")
-@CrossOrigin
+
@RestController
@RequestMapping("/api/position")
public class MobilePositionController {
@@ -51,6 +48,9 @@
@Autowired
private IDeviceService deviceService;
+
+ @Autowired
+ private IDeviceChannelService deviceChannelService;
/**
* 鏌ヨ鍘嗗彶杞ㄨ抗
@@ -103,13 +103,18 @@
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);
- });
+ 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("鑾峰彇绉诲姩浣嶇疆淇℃伅瓒呮椂"));
@@ -136,13 +141,9 @@
@Parameter(name = "expires", description = "璁㈤槄瓒呮椂鏃堕棿", required = true)
@Parameter(name = "interval", description = "涓婃姤鏃堕棿闂撮殧", required = true)
@GetMapping("/subscribe/{deviceId}")
- public 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";
@@ -151,13 +152,28 @@
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 result;
+ /**
+ * 鏁版嵁浣嶇疆淇℃伅鏍煎紡澶勭悊
+ * @param deviceId 璁惧ID
+ * @return true = 鍛戒护鍙戦�佹垚鍔�
+ */
+ @Operation(summary = "鏁版嵁浣嶇疆淇℃伅鏍煎紡澶勭悊")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @GetMapping("/transform/{deviceId}")
+ public void positionTransform(@PathVariable String deviceId) {
+
+ Device device = deviceService.getDevice(deviceId);
+ if (device == null) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "鏈壘鍒拌澶囷細 " + deviceId);
+ }
+ boolean result = deviceChannelService.updateAllGps(device);
+ if (!result) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
}
}
--
Gitblit v1.8.0