From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 f0e99e0..8c870e9 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
@@ -1,12 +1,14 @@
package com.ycl.controller.video;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.video.VideoPoint;
import com.ycl.service.video.impl.IVideoPointService;
+import com.ycl.util.VideoUtil;
+import com.ycl.vo.equipment.VideoPointVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +29,8 @@
@Autowired
IVideoPointService iVideoPointService;
+ @Autowired
+ VideoUtil videoUtil;
@GetMapping("/query")
@ApiOperation("鏌ヨ")
@@ -35,7 +39,12 @@
@RequestParam Long current,
@RequestParam(required = false) Integer streetId,
@RequestParam(required = false) Integer communityId) {
- return CommonResult.success(iVideoPointService.getList(streetId,communityId, current.intValue(), size.intValue()));
+
+ IPage<VideoPointVo> pointVoIPage = iVideoPointService.getList(streetId, communityId, current.intValue(), size.intValue());
+// pointVoIPage.getRecords()
+// .stream()
+// .forEach(item -> item.setUrlAddress(videoUtil.getVideo(item.getPlatResourceId(), "HLS", 0)));
+ return CommonResult.success(pointVoIPage);
}
@PostMapping("/addition")
--
Gitblit v1.8.0