From c084d6c98af1ef4d36a61adc719df5db76589428 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期六, 07 十月 2023 18:00:08 +0800 Subject: [PATCH] 优化国标级联心跳失败判断逻辑 --- src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) 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 old mode 100644 new mode 100755 index 45ed4f8..be0924a --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java @@ -13,9 +13,9 @@ public interface StreamPushMapper { @Insert("INSERT INTO wvp_stream_push (app, stream, total_reader_count, origin_type, origin_type_str, " + - "push_time, alive_second, media_server_id, server_id, update_time, create_time, push_ing, self) VALUES" + + "push_time, alive_second, media_server_id, update_time, create_time, push_ing, self) VALUES" + "(#{app}, #{stream}, #{totalReaderCount}, #{originType}, #{originTypeStr}, " + - "#{pushTime}, #{aliveSecond}, #{mediaServerId} , #{serverId} , #{updateTime} , #{createTime}, " + + "#{pushTime}, #{aliveSecond}, #{mediaServerId} , #{updateTime} , #{createTime}, " + "#{pushIng}, #{self} )") int add(StreamPushItem streamPushItem); @@ -79,13 +79,13 @@ " <if test='mediaServerId != null' > AND st.media_server_id=#{mediaServerId} </if>" + "order by st.create_time desc" + " </script>"}) - List<StreamPushItem> selectAllForList(String query, Boolean pushing, String mediaServerId); + List<StreamPushItem> selectAllForList(@Param("query") String query, @Param("pushing") Boolean pushing, @Param("mediaServerId") String mediaServerId); @Select("SELECT st.*, gs.gb_id, gs.name, gs.longitude, gs.latitude FROM wvp_stream_push st LEFT join wvp_gb_stream gs on st.app = gs.app AND st.stream = gs.stream order by st.create_time desc") List<StreamPushItem> selectAll(); @Select("SELECT st.*, gs.gb_id, gs.name, gs.longitude, gs.latitude FROM wvp_stream_push st LEFT join wvp_gb_stream gs on st.app = gs.app AND st.stream = gs.stream WHERE st.app=#{app} AND st.stream=#{stream}") - StreamPushItem selectOne(String app, String stream); + StreamPushItem selectOne(@Param("app") String app, @Param("stream") String stream); @Insert("<script>" + "Insert INTO wvp_stream_push (app, stream, total_reader_count, origin_type, origin_type_str, " + @@ -122,17 +122,17 @@ @Update("UPDATE wvp_stream_push " + "SET status=#{status} " + "WHERE app=#{app} AND stream=#{stream}") - int updateStatus(String app, String stream, boolean status); + int updateStatus(@Param("app") String app, @Param("stream") String stream, @Param("status") boolean status); @Update("UPDATE wvp_stream_push " + "SET push_ing=#{pushIng} " + "WHERE app=#{app} AND stream=#{stream}") - int updatePushStatus(String app, String stream, boolean pushIng); + int updatePushStatus(@Param("app") String app, @Param("stream") String stream, @Param("pushIng") boolean pushIng); @Update("UPDATE wvp_stream_push " + "SET status=#{status} " + "WHERE media_server_id=#{mediaServerId}") - void updateStatusByMediaServerId(String mediaServerId, boolean status); + void updateStatusByMediaServerId(@Param("mediaServerId") String mediaServerId, @Param("status") boolean status); @Select("<script> "+ -- Gitblit v1.8.0