Commit 6a5ab117f527f7bde4d2ecaa622d63cd09969002

Authored by 648540858
1 parent f1c7d612

修复推流列表状态过滤

@@ -60,20 +60,6 @@ @@ -60,20 +60,6 @@
60 <dependency> 60 <dependency>
61 <groupId>org.springframework.boot</groupId> 61 <groupId>org.springframework.boot</groupId>
62 <artifactId>spring-boot-starter-data-redis</artifactId> 62 <artifactId>spring-boot-starter-data-redis</artifactId>
63 - <exclusions>  
64 - <exclusion>  
65 - <groupId>redis.clients</groupId>  
66 - <artifactId>jedis</artifactId>  
67 - </exclusion>  
68 - <exclusion>  
69 - <groupId>io.lettuce</groupId>  
70 - <artifactId>lettuce-core</artifactId>  
71 - </exclusion>  
72 - </exclusions>  
73 - </dependency>  
74 - <dependency>  
75 - <groupId>org.apache.commons</groupId>  
76 - <artifactId>commons-pool2</artifactId>  
77 </dependency> 63 </dependency>
78 <dependency> 64 <dependency>
79 <groupId>org.springframework.boot</groupId> 65 <groupId>org.springframework.boot</groupId>
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
@@ -77,7 +77,7 @@ public interface StreamPushMapper { @@ -77,7 +77,7 @@ public interface StreamPushMapper {
77 "1=1 " + 77 "1=1 " +
78 " <if test='query != null'> AND (st.app LIKE '%${query}%' OR st.stream LIKE '%${query}%' OR gs.gbId LIKE '%${query}%' OR gs.name LIKE '%${query}%')</if> " + 78 " <if test='query != null'> AND (st.app LIKE '%${query}%' OR st.stream LIKE '%${query}%' OR gs.gbId LIKE '%${query}%' OR gs.name LIKE '%${query}%')</if> " +
79 " <if test='pushing == true' > AND (gs.gbId is null OR st.pushIng=1)</if>" + 79 " <if test='pushing == true' > AND (gs.gbId is null OR st.pushIng=1)</if>" +
80 - " <if test='pushing == false' > AND (gs.pushIng is null OR st.pushIng=0) </if>" + 80 + " <if test='pushing == false' > AND (st.pushIng is null OR st.pushIng=0) </if>" +
81 " <if test='mediaServerId != null' > AND st.mediaServerId=#{mediaServerId} </if>" + 81 " <if test='mediaServerId != null' > AND st.mediaServerId=#{mediaServerId} </if>" +
82 "order by st.createTime desc" + 82 "order by st.createTime desc" +
83 " </script>"}) 83 " </script>"})