diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java index d85fb45ae..5bcd98d4a 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java @@ -591,6 +591,9 @@ public interface CommonGBChannelMapper { @SelectProvider(type = ChannelProvider.class, method = "queryOnlineListsByGbDeviceId") List queryOnlineListsByGbDeviceId(@Param("deviceId") int deviceId); + @SelectProvider(type = ChannelProvider.class, method = "queryCommonChannelByDeviceChannel") + CommonGBChannel queryCommonChannelByDeviceChannel(DeviceChannel channel); + @Update("UPDATE wvp_device_channel SET stream_id = #{stream} where id = #{gbId}") void updateStream(int gbId, String stream); @@ -660,5 +663,6 @@ public interface CommonGBChannelMapper { @SelectProvider(type = ChannelProvider.class, method = "queryCameraChannelByIds") List queryCameraChannelByIds(List channelList); - + @SelectProvider(type = ChannelProvider.class, method = "queryOldChanelListByChannels") + List queryOldChanelListByChannels(List channelList); } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java index 60e06d527..6c3d23eb2 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java @@ -105,8 +105,8 @@ public interface DeviceChannelMapper { @Delete("DELETE FROM wvp_device_channel WHERE data_type =1 and data_device_id=#{dataDeviceId}") int cleanChannelsByDeviceId(@Param("dataDeviceId") int dataDeviceId); - @Delete("DELETE FROM wvp_device_channel WHERE id=#{id}") - int del(@Param("id") int id); + @Delete("DELETE FROM wvp_device_channel WHERE WHERE data_type=#{dataType} and data_device_id=#{dataDeviceId} AND device_id=#{deviceId}") + int deleteForNotify(DeviceChannel channel); @Select(value = {"