Merge pull request #388 from AbnerSC/wvp-28181-2.0

648540858

2022-03-11 98d12ecd6bdc49e6bed86eda4f55ab75e940ca36

Merge pull request #388 from AbnerSC/wvp-28181-2.0

修复关闭按需拉流无效的问题，和几个小问题

 pom.xml

@@ -169,13 +169,6 @@
            <version>1.2.73</version>
        </dependency>

        <!--Guava是一种基于开源的Java库-->
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
            <version>30.0-jre</version>
        </dependency>

        <!-- okhttp -->
        <dependency>
            <groupId>com.squareup.okhttp3</groupId>
@@ -279,6 +272,9 @@
            <plugin>
                <groupId>pl.project13.maven</groupId>
                <artifactId>git-commit-id-plugin</artifactId>
                <configuration>
                    <offline>true</offline>
                </configuration>
            </plugin>

            <plugin>

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -459,7 +459,7 @@
                }

            }

            MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);

            if (mediaServerItem != null && "-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())) {

            if (mediaServerItem != null && mediaServerItem.getStreamNoneReaderDelayMS() == -1) {

                ret.put("close", false);

            }

            return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);


 src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java

@@ -512,7 +512,7 @@
        param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex));
        param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrex));
        param.put("hook.timeoutSec","20");
        param.put("general.streamNoneReaderDelayMS","-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())?"3600000":mediaServerItem.getStreamNoneReaderDelayMS() );
        param.put("general.streamNoneReaderDelayMS",mediaServerItem.getStreamNoneReaderDelayMS()==-1?"3600000":mediaServerItem.getStreamNoneReaderDelayMS() );
        // 推流断开后可以在超时时间内重新连接上继续推流，这样播放器会接着播放。
        // 置0关闭此特性(推流断开会导致立即断开播放器)
        // 此参数不应大于播放器超时时间

 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java

@@ -231,7 +231,6 @@
            "        name as title,\n" +
            "        channelId as \"value\",\n" +
            "        channelId as \"key\",\n" +
            "        channelId,\n" +
            "        longitude,\n" +
            "        latitude\n" +
            "        from device_channel\n" +