Commit 9bd8fb8c authored by lisong's avatar lisong

修改查询监控视频接收参数格式

parent 015f0ce2
...@@ -47,9 +47,9 @@ public class BuildingVideoController extends AbstractBaseController { ...@@ -47,9 +47,9 @@ public class BuildingVideoController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation("消防建筑视屏监控分页列表") @ApiOperation("消防建筑视屏监控分页列表")
@PostMapping(value = "/page") @GetMapping(value = "/page")
public Page<BuildingVideoVO> buildingList(@RequestParam(required = false) Page page,@RequestParam(required = false) BuildingVideoListVO dto, @RequestParam(required = false) List<String> ids) { public Page<BuildingVideoVO> buildingList( Page page, BuildingVideoListVO dto) {
return buildService.buildingVideoList(page, dto,ids); return buildService.buildingVideoList(page, dto);
} }
@GetMapping(value = "/fire/equip") @GetMapping(value = "/fire/equip")
......
...@@ -21,7 +21,7 @@ import java.util.Map; ...@@ -21,7 +21,7 @@ import java.util.Map;
public interface VideoMapper extends BaseMapper<Video> { public interface VideoMapper extends BaseMapper<Video> {
Page<PageVideoVO> pageVideo(@Param("page") IPage<Video> page, @Param("video") Video video); Page<PageVideoVO> pageVideo(@Param("page") IPage<Video> page, @Param("video") Video video);
Page<BuildingVideoVO> pageBuildingVideo(@Param("page") Page page, @Param("dto") BuildingVideoListVO dto, @Param("ids") List<String> ids); Page<BuildingVideoVO> pageBuildingVideo(@Param("page") Page page, @Param("dto") BuildingVideoListVO dto);
/** /**
* 视屏监控绑定的消防设备查询 * 视屏监控绑定的消防设备查询
......
...@@ -207,7 +207,7 @@ public interface IBuilldService extends IService<Building> { ...@@ -207,7 +207,7 @@ public interface IBuilldService extends IService<Building> {
* @param dto * @param dto
* @return * @return
*/ */
Page<BuildingVideoVO> buildingVideoList(Page page, BuildingVideoListVO dto,List<String> ids); Page<BuildingVideoVO> buildingVideoList(Page page, BuildingVideoListVO dto);
/** /**
* 通过监控视频 查看 绑定的 消防设备 * 通过监控视频 查看 绑定的 消防设备
......
...@@ -27,7 +27,7 @@ public interface IVideoService extends IService<Video> { ...@@ -27,7 +27,7 @@ public interface IVideoService extends IService<Video> {
VideoSaveDto detail(Long id); VideoSaveDto detail(Long id);
Page<BuildingVideoVO> pageBuildingVideo(Page page, BuildingVideoListVO dto,List<String> ids); Page<BuildingVideoVO> pageBuildingVideo(Page page, BuildingVideoListVO dto);
/** /**
* 视屏监控绑定的消防设备查询 * 视屏监控绑定的消防设备查询
......
...@@ -867,8 +867,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i ...@@ -867,8 +867,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
} }
@Override @Override
public Page<BuildingVideoVO> buildingVideoList(Page page, BuildingVideoListVO dto,List<String> ids) { public Page<BuildingVideoVO> buildingVideoList(Page page, BuildingVideoListVO dto) {
Page<BuildingVideoVO> pages = videoService.pageBuildingVideo(page, dto,ids); Page<BuildingVideoVO> pages = videoService.pageBuildingVideo(page, dto);
pages.getRecords().forEach(x -> { pages.getRecords().forEach(x -> {
if (StringUtil.isNotEmpty(x.getLocation()) && StringUtil.isNotEmpty(x.getAddress())) { if (StringUtil.isNotEmpty(x.getLocation()) && StringUtil.isNotEmpty(x.getAddress())) {
x.setLocation(x.getLocation() + '-' + x.getAddress()); x.setLocation(x.getLocation() + '-' + x.getAddress());
......
...@@ -252,8 +252,8 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements ...@@ -252,8 +252,8 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
} }
@Override @Override
public Page<BuildingVideoVO> pageBuildingVideo(Page page, BuildingVideoListVO dto,List<String> ids) { public Page<BuildingVideoVO> pageBuildingVideo(Page page, BuildingVideoListVO dto) {
return this.baseMapper.pageBuildingVideo(page, dto,ids); return this.baseMapper.pageBuildingVideo(page, dto);
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment