guzijian / wvp-GB28181-pro · Commits

Commit f3388dd53aa81138404a4a080b2ad2e97d0a01df

Authored by 648540858
1 parent e68eb850

修复级联录像查询sql错误

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
  View file @f3388dd
@@ -178,7 +178,7 @@ public class DeviceServiceImpl implements IDeviceService { @@ -178,7 +178,7 @@ public class DeviceServiceImpl implements IDeviceService {
178 178
179 @Override 179 @Override
180 public void offline(String deviceId, String reason) { 180 public void offline(String deviceId, String reason) {
181 - logger.error("[设备离线]，{}, device：{}", reason, deviceId); 181 + logger.warn("[设备离线]，{}, device：{}", reason, deviceId);
182 Device device = deviceMapper.getDeviceByDeviceId(deviceId); 182 Device device = deviceMapper.getDeviceByDeviceId(deviceId);
183 if (device == null) { 183 if (device == null) {
184 return; 184 return;
src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
  View file @f3388dd
@@ -96,6 +96,6 @@ public interface ParentPlatformMapper { @@ -96,6 +96,6 @@ public interface ParentPlatformMapper {
96 96
97 @Select("select 'channel' as name, count(pgc.platform_id) count from wvp_platform_gb_channel pgc left join wvp_device_channel dc on dc.id = pgc.device_channel_id where pgc.platform_id=#{platform_id} and dc.channel_id =#{gbId} " + 97 @Select("select 'channel' as name, count(pgc.platform_id) count from wvp_platform_gb_channel pgc left join wvp_device_channel dc on dc.id = pgc.device_channel_id where pgc.platform_id=#{platform_id} and dc.channel_id =#{gbId} " +
98 "union " + 98 "union " +
99 - "select 'stream' as name, count(pgs.platform_id) count from wvp_platform_gb_stream pgs left join wvp_gb_stream gs on pgs.gb_stream_id = gs.gb_stream_id where pgs.platform_id=#{platform_id} and gs.gb_id #{gbId}") 99 + "select 'stream' as name, count(pgs.platform_id) count from wvp_platform_gb_stream pgs left join wvp_gb_stream gs on pgs.gb_stream_id = gs.gb_stream_id where pgs.platform_id=#{platform_id} and gs.gb_id =#{gbId}")
100 List<ChannelSourceInfo> getChannelSource(String platform_id, String gbId); 100 List<ChannelSourceInfo> getChannelSource(String platform_id, String gbId);
101 } 101 }