From a8a8b384f755b454242a709d86cfef6377a12d33 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 12 十二月 2022 17:46:09 +0800
Subject: [PATCH] fix: 对外提供Api
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 c47ac37..06a9f6d 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,6 +1,8 @@
package com.ycl.controller.cockpit.aiIot;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ycl.api.CommonResult;
+import com.ycl.entity.video.VideoPoint;
import com.ycl.service.video.impl.IVideoPointService;
import com.ycl.util.CheckApiUtil;
import com.ycl.util.VideoUtil;
@@ -40,6 +42,7 @@
@Autowired
private VideoUtil videoUtil;
+
@ApiOperation(value = "鐩戞祴鏁版嵁")
@GetMapping("/detection")
public CommonResult<AIIotVO.DetectionVO> detection(@Validated CockpitVO params) {
@@ -57,7 +60,7 @@
@GetMapping("/video")
public CommonResult video(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
- return CommonResult.success(iVideoPointService.list().stream().map(item -> {
+ return CommonResult.success(iVideoPointService.list(new LambdaQueryWrapper<VideoPoint>().eq(params.getStreetId()==null,VideoPoint::getStreetId,params.getStreetId())).stream().map(item -> {
VideoVO videoVO = new VideoVO();
videoVO.setName(item.getName());
videoVO.setBrand(item.getEquipmentBrand());
@@ -65,7 +68,7 @@
videoVO.setIp(item.getEquipmentIp());
videoVO.setLatitude(item.getLatitude().toString());
videoVO.setLongitude(item.getLongitude().toString());
- videoVO.setUrl(videoUtil.getVideo(item.getPlatResourceId(), "HLS", 0));
+ videoVO.setResourceId(item.getPlatResourceId());
return videoVO;
}).collect(Collectors.toList()));
}
--
Gitblit v1.8.0