Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

# Conflicts: # src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
2021-01-08 17:31:49 +08:00
parent 675ce2346d 1342aad032
commit 7e581e9d3a
10 changed files with 110 additions and 53 deletions
--- a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
@@ -168,6 +168,7 @@ public class ApiStreamController {
        }
        cmder.streamByeCmd(streamInfo.getStreamId());
        redisCatchStorage.stopPlay(streamInfo);
+        storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
        return null;
    }