guzijian / wvp-GB28181-pro · Commits

Commit 013448842833ebed52ef13846572408b7095bf7b

Authored by 648540858
1 parent ee7ef0bf

优化推流列表查询

Inline Side-by-side
Showing 2 changed files with 1 additions and 3 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
  View file @0134488
... ... @@ -211,7 +211,6 @@ public class SubscribeRequestProcessor extends SIPRequestProcessorParent impleme
211 211 }else if (subscribeInfo.getExpires() == 0) {
212 212 subscribeHolder.removeCatalogSubscribe(platformId);
213 213 }
214   -
215 214 try {
216 215 ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
217 216 responseXmlAck(evt, resultXml.toString(), parentPlatform);
... ... @@ -219,5 +218,4 @@ public class SubscribeRequestProcessor extends SIPRequestProcessorParent impleme
219 218 e.printStackTrace();
220 219 }
221 220 }
222   -
223 221 }
... ...
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
  View file @0134488
... ... @@ -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 st.pushIng=0</if>" +
  80 + " <if test='pushing == false' > AND (gs.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>"})
... ...