wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-07-22 08:56:04 +08:00
parent f41ef8a3ba fc66ef062b
commit f3dc7ca4d5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraChannelMapper.java
View File

@ -7,6 +7,7 @@ import io.renren.modules.monitor.dto.CameraChannelNLDto;
import io.renren.modules.monitor.dto.ChannelLabelDto; import io.renren.modules.monitor.dto.ChannelLabelDto;
import io.renren.modules.monitor.entity.CameraChannel; import io.renren.modules.monitor.entity.CameraChannel;
import io.renren.modules.monitor.entity.Label; import io.renren.modules.monitor.entity.Label;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
@ -71,4 +72,7 @@ public interface CameraChannelMapper extends BaseDao<CameraChannel> {
List<Map> selectChannelNumByRegion(); List<Map> selectChannelNumByRegion();
void batchSaveMtmLabel(@Param("list") List<Map<String,Object>> list); void batchSaveMtmLabel(@Param("list") List<Map<String,Object>> 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();
} }

7
renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java
View File

@ -1312,10 +1312,13 @@ public class MonitorService {
CompletableFuture.allOf(completableFutureLis.toArray(new CompletableFuture[completableFutureLis.size()])).join(); CompletableFuture.allOf(completableFutureLis.toArray(new CompletableFuture[completableFutureLis.size()])).join();
//6-更新完通道信息后，查询地区下通道的数量并更新到地区表和市区表中 //6-更新完通道信息后,删除经度或纬度为空的视频通道信息
cameraChannelMapper.deleteByNonPlace();
//7-查询地区下通道的数量并更新到地区表和市区表中
editChannelCount(); editChannelCount();
//7-同步武伟达的t_channel_mtm_label数据 //8-同步武伟达的t_channel_mtm_label数据
synchronizeMtmLabel(); synchronizeMtmLabel();
} }