From 38b44e0c9996f06524903417f1d0a3f746b4550b Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 04 十二月 2023 17:47:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java b/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java index 6de5eb9..7d22e90 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java @@ -37,10 +37,11 @@ @LogSave(operationType = "鐐逛綅绠$悊", contain = "鏌ヨ鐐逛綅") public CommonResult searchVideoPoint(@RequestParam Long size, @RequestParam Long current, + @RequestParam(required = false) Integer type, @RequestParam(required = false) Integer streetId, @RequestParam(required = false) Integer communityId) { - IPage<VideoPointVo> pointVoIPage = iVideoPointService.getList(streetId, communityId, current.intValue(), size.intValue()); + IPage<VideoPointVo> pointVoIPage = iVideoPointService.getList(streetId, communityId, type, current.intValue(), size.intValue()); // pointVoIPage.getRecords() // .stream() // .forEach(item -> item.setUrlAddress(videoUtil.getVideo(item.getPlatResourceId(), "HLS", 0))); -- Gitblit v1.8.0