From 095a3e1384319a6ad7a757a0b2125f2aa0a64313 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 31 七月 2023 12:26:42 +0800
Subject: [PATCH] 移除无用代码
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 11 +++++++++++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 5 +----
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java | 2 +-
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 8 --------
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
index d684056..cff3b31 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
@@ -334,7 +334,7 @@
* @param endTime 鎶ヨ鍙戠敓缁堟鏃堕棿锛堝彲閫夛級
* @return true = 鍛戒护鍙戦�佹垚鍔�
*/
- void alarmSubscribe(Device device, int expires, String startPriority, String endPriority, String alarmMethod, String alarmType, String startTime, String endTime) throws InvalidArgumentException, SipException, ParseException;
+ void alarmSubscribe(Device device, int expires, String startPriority, String endPriority, String alarmMethod, String startTime, String endTime) throws InvalidArgumentException, SipException, ParseException;
/**
* 璁㈤槄銆佸彇娑堣闃呯洰褰曚俊鎭�
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
index 782dc06..dd46544 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -1228,7 +1228,7 @@
* @return true = 鍛戒护鍙戦�佹垚鍔�
*/
@Override
- public void alarmSubscribe(Device device, int expires, String startPriority, String endPriority, String alarmMethod, String alarmType, String startTime, String endTime) throws InvalidArgumentException, SipException, ParseException {
+ public void alarmSubscribe(Device device, int expires, String startPriority, String endPriority, String alarmMethod, String startTime, String endTime) throws InvalidArgumentException, SipException, ParseException {
StringBuffer cmdXml = new StringBuffer(200);
String charset = device.getCharset();
@@ -1245,9 +1245,6 @@
}
if (!ObjectUtils.isEmpty(alarmMethod)) {
cmdXml.append("<AlarmMethod>" + alarmMethod + "</AlarmMethod>\r\n");
- }
- if (!ObjectUtils.isEmpty(alarmType)) {
- cmdXml.append("<AlarmType>" + alarmType + "</AlarmType>\r\n");
}
if (!ObjectUtils.isEmpty(startTime)) {
cmdXml.append("<StartAlarmTime>" + startTime + "</StartAlarmTime>\r\n");
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
index 6e748f4..17e8e21 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
@@ -183,6 +183,17 @@
redisCatchStorage.sendDeviceOrChannelStatus(device.getDeviceId(), null, true);
}
+//
+// try {
+// cmder.alarmSubscribe(device, 600, "0", "4", "0", "2023-7-27T00:00:00", "2023-7-28T00:00:00");
+// } catch (InvalidArgumentException e) {
+// throw new RuntimeException(e);
+// } catch (SipException e) {
+// throw new RuntimeException(e);
+// } catch (ParseException e) {
+// throw new RuntimeException(e);
+// }
+
}
@Override
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
index f4bcb1a..72641be 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
@@ -266,12 +266,4 @@
return result;
}
-
- @PostMapping(value = "/test/getPort")
- @ResponseBody
- public int getPort() {
- int result = sendRtpPortManager.getNextPort(mediaServerService.getDefaultMediaServer());
- System.out.println(result);
- return result;
- }
}
--
Gitblit v1.8.0