From b46e5efad22fb810e49f0a2e7835d785e85b4860 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 01 九月 2022 22:27:18 +0800
Subject: [PATCH] 测试sip消息预处理
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 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..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;
@@ -136,13 +138,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 +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 result;
}
}
--
Gitblit v1.8.0