guzijian / wvp-GB28181-pro · Commits

Commit 6a5ab117f527f7bde4d2ecaa622d63cd09969002

Authored by 648540858
1 parent f1c7d612

修复推流列表状态过滤

Inline Side-by-side
Showing 2 changed files with 1 additions and 15 deletions
... ... @@ -60,20 +60,6 @@
60 60 <dependency>
61 61 <groupId>org.springframework.boot</groupId>
62 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 63 </dependency>
78 64 <dependency>
79 65 <groupId>org.springframework.boot</groupId>
... ...
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
  View file @6a5ab11
... ... @@ -77,7 +77,7 @@ public interface StreamPushMapper {
77 77 "1=1 " +
78 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 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 81 " <if test='mediaServerId != null' > AND st.mediaServerId=#{mediaServerId} </if>" +
82 82 "order by st.createTime desc" +
83 83 " </script>"})
... ...