From dd2ae6578673651712134fd1867dca514cfec61f Mon Sep 17 00:00:00 2001
From: chenzhangyue <chenzhangyue01@weidian.com>
Date: 星期四, 10 八月 2023 20:00:43 +0800
Subject: [PATCH] 修复代理访问跨域问题，和ScheduledFuture取消任务时指令重排异常，不结束正在运行的任务。防止 Command interrupted
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java | 24 ------------------------
1 files changed, 0 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
index 5677c95..8a62182 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
@@ -156,29 +156,5 @@
}
}
- /*============================璁惧涓诲瓙鐮佹祦閫昏緫START========================*/
- public static String getPlayKey(String deviceId,String channelId,boolean deviceSwitchSubStream,boolean isSubStream){
- String key = null;
- if(deviceSwitchSubStream){
- key = CALLBACK_CMD_PLAY + isSubStream + deviceId + channelId;
- }else {
- key = CALLBACK_CMD_PLAY +deviceId + channelId;
- }
- return key;
- }
-
- public static String getSnapKey(String deviceId,String channelId,boolean deviceSwitchSubStream,boolean isSubStream){
- String key = null;
- if(deviceSwitchSubStream){
- key = CALLBACK_CMD_SNAP + isSubStream + deviceId + channelId;
- }else {
- key = CALLBACK_CMD_SNAP +deviceId + channelId;
- }
- return key;
- }
-
-
- /*============================璁惧涓诲瓙鐮佹祦閫昏緫END========================*/
-
}
--
Gitblit v1.8.0