Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复推流流注册时写入服务ID

dev/数据库统合
648540858 2024-12-30 16:39:48 +08:00
parent 785da6d5ef
commit c2fb892f2a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java
View File

@ -82,7 +82,7 @@ public interface StreamPushMapper {
@Update("UPDATE wvp_stream_push " + @Update("UPDATE wvp_stream_push " +
"SET pushing=#{pushing}, server_id=#{serverId} " + "SET pushing=#{pushing}, server_id=#{serverId} " +
"WHERE id=#{id}") "WHERE id=#{id}")
int updatePushStatus(@Param("id") int id, @Param("pushing") boolean pushing); int updatePushStatus(@Param("id") int id, @Param("pushing") boolean pushing, @Param("serverId") String serverId);
@Select("<script> "+ @Select("<script> "+
"SELECT st.*, st.id as data_device_id, wdc.*, wdc.id as gb_id FROM wvp_stream_push st LEFT join wvp_device_channel wdc on wdc.data_type = 2 and st.id = wdc.data_device_id " + "SELECT st.*, st.id as data_device_id, wdc.*, wdc.id as gb_id FROM wvp_stream_push st LEFT join wvp_device_channel wdc on wdc.data_type = 2 and st.id = wdc.data_device_id " +

3
src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
View File

@ -505,8 +505,7 @@ public class StreamPushServiceImpl implements IStreamPushService {
streamPush.setGbStatus(pushIng?"ON":"OFF"); streamPush.setGbStatus(pushIng?"ON":"OFF");
} }
streamPush.setPushTime(DateUtil.getNow()); streamPush.setPushTime(DateUtil.getNow());
streamPush.setServerId(userSetting.getServerId()); streamPushMapper.updatePushStatus(streamPush.getId(), pushIng, userSetting.getServerId());
streamPushMapper.updatePushStatus(streamPush.getId(), pushIng);
if (ObjectUtils.isEmpty(streamPush.getGbDeviceId())) { if (ObjectUtils.isEmpty(streamPush.getGbDeviceId())) {
return; return;
} }