diff --git a/pom.xml b/pom.xml index f0052470..71dd9485 100644 --- a/pom.xml +++ b/pom.xml @@ -60,20 +60,6 @@ org.springframework.boot spring-boot-starter-data-redis - - - redis.clients - jedis - - - io.lettuce - lettuce-core - - - - - org.apache.commons - commons-pool2 org.springframework.boot diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java index 0e656cff..675a8bcd 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java @@ -77,7 +77,7 @@ public interface StreamPushMapper { "1=1 " + " AND (st.app LIKE '%${query}%' OR st.stream LIKE '%${query}%' OR gs.gbId LIKE '%${query}%' OR gs.name LIKE '%${query}%') " + " AND (gs.gbId is null OR st.pushIng=1)" + - " AND (gs.pushIng is null OR st.pushIng=0) " + + " AND (st.pushIng is null OR st.pushIng=0) " + " AND st.mediaServerId=#{mediaServerId} " + "order by st.createTime desc" + " "})