From a9be2e0bfbd8e716207fc467e2699d9caec76a7c Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 07 十二月 2022 17:44:38 +0800
Subject: [PATCH] feat: 实时视频Api fix: 事件Api 视频点位api 视频巡查api
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java
index 1393455..05d97ea 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java
@@ -1,16 +1,18 @@
package com.ycl.controller.cockpit.aiIot;
import com.ycl.api.CommonResult;
+import com.ycl.service.video.impl.IVideoPointService;
import com.ycl.util.CheckApiUtil;
+import com.ycl.util.VideoUtil;
import com.ycl.vo.cockpit.CockpitVO;
import com.ycl.vo.cockpit.aiIot.AIIotVO;
+import com.ycl.vo.cockpit.aiIot.VideoVO;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@@ -18,6 +20,7 @@
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author Lyq
@@ -31,6 +34,11 @@
@Resource
private CheckApiUtil checkApiUtil;
+
+ @Autowired
+ private IVideoPointService iVideoPointService;
+ @Autowired
+ private VideoUtil videoUtil;
@ApiOperation(value = "鐩戞祴鏁版嵁")
@GetMapping("/detection")
@@ -47,23 +55,19 @@
@ApiOperation(value = "瀹炴椂瑙嗛鐩戞帶")
@GetMapping("/video")
- public CommonResult<List<AIIotVO.VideoVO>> video(@Validated CockpitVO params) {
- checkApiUtil.cockpit(params);
- List<AIIotVO.VideoVO> videoVOS = new ArrayList<>();
- AIIotVO.VideoVO a = null;
- for (int i = 0; i < 4; i++) {
- a = new AIIotVO.VideoVO();
- a.setLongitude("32.11");
- a.setLatitude("106.111");
- a.setName("璁惧涓�");
- a.setResourceId("012");
- a.setBrand("澶у崕");
- a.setModel("鐞冩満");
- a.setIp("10.23.14.2");
- a.setUrl("http://10.23.14.2:12001");
- videoVOS.add(a);
- }
- return CommonResult.success(videoVOS);
+ public CommonResult video(@Validated CockpitVO params) {
+ //checkApiUtil.cockpit(params);
+ return CommonResult.success(iVideoPointService.list().stream().map(item -> {
+ VideoVO videoVO = new VideoVO();
+ videoVO.setName(item.getName());
+ videoVO.setBrand(item.getEquipmentBrand());
+ videoVO.setModel(item.getEquipmentModel());
+ videoVO.setIp(item.getEquipmentIp());
+ videoVO.setLatitude(item.getLatitude().toString());
+ videoVO.setLongitude(item.getLongitude().toString());
+ videoVO.setUrl(videoUtil.getVideo(item.getPlatResourceId(), "HLS", 0));
+ return videoVO;
+ }).collect(Collectors.toList()));
}
@ApiOperation(value = "AI绠楁硶鏁堣兘")
--
Gitblit v1.8.0