From 8801c7741bc0828425251327a62f6e20dada4132 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期一, 11 一月 2021 09:18:00 +0800
Subject: [PATCH] 与2.0同步修改

---
 src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java          |    2 --
 src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java     |    1 -
 src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java |    7 -------
 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java |    9 ---------
 4 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
index 24a3f84..57dc96d 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -19,15 +19,6 @@
             "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status})")
     int add(DeviceChannel channel);
 
-//    @Update("UPDATE device_channel " +
-//            "SET name=#{name}, manufacture=#{manufacture}, model=#{model}, owner=#{owner}, civilCode=#{civilCode}, " +
-//            "block=#{block}, address=#{address}, parental=#{parental}, parentId=#{parentId}, safetyWay=#{safetyWay}, " +
-//            "registerWay=#{registerWay}, certNum=#{certNum}, certifiable=#{certifiable}, errCode=#{errCode}, secrecy=#{secrecy}, " +
-//            "ipAddress=#{ipAddress}, port=#{port}, password=#{password}, PTZType=#{PTZType}, status=#{status}, streamId=#{streamId}, " +
-//            "hasAudio=#{hasAudio}" +
-//            "WHERE deviceId=#{deviceId} AND channelId=#{channelId}")
-
-
     @Update(value = {" <script>" +
             "UPDATE device_channel " +
             "SET deviceId='${deviceId}'" +
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
index d64b632..17d1e7d 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
@@ -63,13 +63,6 @@
 
 	/**
 	 * 鍒嗛〉鏌ヨ閫氶亾鏁�
-	 * @param deviceId 璁惧id
-	 * @param page 褰撳墠椤�
-	 * @param count 姣忛〉鏉℃暟
-	 * @return 閫氶亾鍒楄〃
-	 */
-	/**
-	 * 鍒嗛〉鏌ヨ閫氶亾鏁�
 	 *
 	 * @param deviceId 璁惧id
 	 * @param page 褰撳墠椤�
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
index c6c6c5b..3bd828a 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
@@ -169,7 +169,6 @@
 		// 瓒呮椂澶勭悊
 		result.onTimeout(()->{
 			logger.warn(String.format("璁惧棰勮/鍥炴斁鍋滄瓒呮椂锛宻treamId锛�%s ", streamId));
-
 			RequestMessage msg = new RequestMessage();
 			msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
 			msg.setData("Timeout");
diff --git a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
index dff6d72..f31bd60 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
@@ -39,8 +39,6 @@
     @Autowired
     private IRedisCatchStorage redisCatchStorage;
 
-    private boolean closeWaitRTPInfo = false;
-
 
     @Autowired
     private ZLMRESTfulUtils zlmresTfulUtils;

--
Gitblit v1.8.0