diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraChannelMapper.java b/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraChannelMapper.java index 40d9092b..642f5c6b 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraChannelMapper.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraChannelMapper.java @@ -7,6 +7,7 @@ import io.renren.modules.monitor.dto.CameraChannelNLDto; import io.renren.modules.monitor.dto.ChannelLabelDto; import io.renren.modules.monitor.entity.CameraChannel; import io.renren.modules.monitor.entity.Label; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -71,4 +72,7 @@ public interface CameraChannelMapper extends BaseDao { List selectChannelNumByRegion(); void batchSaveMtmLabel(@Param("list") List> list); + + @Delete("delete from t_camera_channel where gps_x is null or gps_y is null or gps_x = '' or gps_y = '' ") + void deleteByNonPlace(); } diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java b/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java index 391d858e..14931321 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java @@ -1312,10 +1312,13 @@ public class MonitorService { CompletableFuture.allOf(completableFutureLis.toArray(new CompletableFuture[completableFutureLis.size()])).join(); - //6-更新完通道信息后,查询地区下通道的数量并更新到地区表和市区表中 + //6-更新完通道信息后,删除经度或纬度为空的视频通道信息 + cameraChannelMapper.deleteByNonPlace(); + + //7-查询地区下通道的数量并更新到地区表和市区表中 editChannelCount(); - //7-同步武伟达的t_channel_mtm_label数据 + //8-同步武伟达的t_channel_mtm_label数据 synchronizeMtmLabel(); }