From a683718557e1e706ffcd12ecf326397714ac9475 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 16 三月 2023 21:58:35 +0800
Subject: [PATCH] 驾驶舱接口

---
 ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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 bf474e7..bb353c4 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
@@ -59,6 +59,7 @@
     @Autowired
     IEfficiencyService iEfficiencyService;
 
+
     @ApiOperation(value = "鐩戞祴鏁版嵁")
     @GetMapping("/detection")
     public CommonResult<AIIotVO.DetectionVO> detection(@Validated CockpitVO params) {
@@ -66,7 +67,7 @@
         AIIotVO.DetectionVO detectionVO = new AIIotVO.DetectionVO();
         detectionVO.setVideo(iVideoPointService.count());
         detectionVO.setIndividual(iHandheldTerminalService.count());
-        detectionVO.setLampblack(154L);
+        detectionVO.setLampblack(iEfficiencyService.getSmokeCustomer());
         /// TODO: 2022/12/13 缂哄皯娌圭儫鏈虹洃鎺ц〃
         detectionVO.setLoudspeaker(loudspeakerService.count());
         detectionVO.setSlagCar(iCarSlagcarService.count());
@@ -91,6 +92,7 @@
             videoVO.setLatitude(item.getLatitude() != null ? item.getLatitude().toString() : "");
             videoVO.setLongitude(item.getLongitude() != null ? item.getLongitude().toString() : "");
             videoVO.setResourceId(item.getPlatResourceId());
+            videoVO.setCode(item.getCode());
             return videoVO;
         }).collect(Collectors.toList());
 
@@ -117,9 +119,11 @@
     @GetMapping("/slag_car")
     public CommonResult<AIIotVO.SlagCarVO> slagCar(@Validated CockpitVO params) {
         checkApiUtil.cockpit(params);
+
         AIIotVO.SlagCarVO slagCarVO = new AIIotVO.SlagCarVO();
-        slagCarVO.setCar(236);
-        slagCarVO.setTeam(20);
+        slagCarVO.setCar(iCarSlagcarService.count());
+        slagCarVO.setTeam(0L);
+
         return CommonResult.success(slagCarVO);
     }
 

--
Gitblit v1.8.0