|
|
@@ -85,6 +85,10 @@ public class SasMapServiceImpl extends AbstractCrudService<SasMapsMapper, SasMap
|
|
|
public CommonPage<MapListItem> page(MapPageRequest request) {
|
|
|
IPage<SasMaps> page = new Page<>(request.getCurrent(), request.getSize());
|
|
|
LambdaQueryWrapper<SasMaps> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ // 电子地图配置不展示:视频导出防护(1003)、实时电子巡检(1008) 模块的地图
|
|
|
+ wrapper.notIn(SasMaps::getType,
|
|
|
+ SystemTypeCodeEnum.usbalarm.getCode(),
|
|
|
+ SystemTypeCodeEnum.patrol.getCode());
|
|
|
if (request.getParentId() != null && !request.getParentId().isEmpty()) {
|
|
|
wrapper.eq(SasMaps::getParentId, request.getParentId());
|
|
|
}
|
|
|
@@ -329,8 +333,12 @@ public class SasMapServiceImpl extends AbstractCrudService<SasMapsMapper, SasMap
|
|
|
|
|
|
@Override
|
|
|
public List<MapTreeItem> getMapTree() {
|
|
|
- // 查询所有地图节点
|
|
|
- List<SasMaps> maps = this.list();
|
|
|
+ // 电子地图配置不展示:视频导出防护(1003)、实时电子巡检(1008) 模块的地图
|
|
|
+ LambdaQueryWrapper<SasMaps> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ wrapper.notIn(SasMaps::getType,
|
|
|
+ SystemTypeCodeEnum.usbalarm.getCode(),
|
|
|
+ SystemTypeCodeEnum.patrol.getCode());
|
|
|
+ List<SasMaps> maps = this.list(wrapper);
|
|
|
if (maps == null || maps.isEmpty()) {
|
|
|
return Collections.emptyList();
|
|
|
}
|