From cea14a6019ce363742527a92896eb0c49e9e8599 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 21 三月 2023 16:39:31 +0800
Subject: [PATCH] 驾驶舱事件加分页
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 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 f1e4ead..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
@@ -12,6 +12,7 @@
import com.ycl.util.CheckApiUtil;
import com.ycl.util.VideoUtil;
import com.ycl.vo.cockpit.CockpitVO;
+import com.ycl.vo.cockpit.aiIot.AIIotStatisticsVO;
import com.ycl.vo.cockpit.aiIot.AIIotVO;
import com.ycl.vo.cockpit.aiIot.EfficiencyVO;
import com.ycl.vo.cockpit.aiIot.VideoVO;
@@ -58,6 +59,7 @@
@Autowired
IEfficiencyService iEfficiencyService;
+
@ApiOperation(value = "鐩戞祴鏁版嵁")
@GetMapping("/detection")
public CommonResult<AIIotVO.DetectionVO> detection(@Validated CockpitVO params) {
@@ -65,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());
@@ -90,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());
@@ -102,12 +105,11 @@
public CommonResult efficiency(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
List<EfficiencyDto> list = iEfficiencyService.list();
- int sum = list.stream().mapToInt(EfficiencyDto::getNumber).sum();
List<EfficiencyVO> efficiencyVOS = list.stream().map((Function<EfficiencyDto, EfficiencyVO>) efficiencyDto -> {
EfficiencyVO a = new EfficiencyVO();
a.setType(efficiencyDto.getName());
a.setCount(efficiencyDto.getNumber());
- a.setRatio(new BigDecimal((double)efficiencyDto.getNumber() / (double) sum).setScale(2, RoundingMode.HALF_UP));
+ a.setRatio(1.0 - ((double) efficiencyDto.getErrorNumber() / (double) efficiencyDto.getNumber()));
return a;
}).collect(Collectors.toList());
return CommonResult.success(efficiencyVOS);
@@ -117,31 +119,21 @@
@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);
}
@ApiOperation(value = "AI浜嬩欢缁熻")
@GetMapping("/event_statistics")
- public CommonResult<List<AIIotVO.StatisticsVO>> statistics(@Validated CockpitVO params) {
+ public CommonResult<List<AIIotStatisticsVO>> statistics(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
- List<AIIotVO.StatisticsVO> statisticsVOS = new ArrayList<>();
- List<AIIotVO.Statistics1VO> statistics1VOS = new ArrayList<>();
- AIIotVO.StatisticsVO a = null;
- AIIotVO.Statistics1VO a1 = null;
- for (int i = 0; i < 4; i++) {
- a = new AIIotVO.StatisticsVO();
- a1 = new AIIotVO.Statistics1VO();
- a.setType("閬撹矾鐮存崯");
- a1.setCount(12);
- a1.setMonth("2022-10");
- statistics1VOS.add(a1);
- a.setRecords(statistics1VOS);
- statisticsVOS.add(a);
- }
- return CommonResult.success(statisticsVOS);
+
+ List<AIIotStatisticsVO> list = iEfficiencyService.aiMonthList();
+ return CommonResult.success(list);
}
--
Gitblit v1.8.0