From 57e344bf720bfeef218dae0cbd3632db8f663139 Mon Sep 17 00:00:00 2001 From: baizonghao <1719256278@qq.com> Date: 星期日, 02 四月 2023 16:34:00 +0800 Subject: [PATCH] 修改 --- ycl-platform/src/main/java/com/ycl/service/apidata/impl/IApiDataServiceImpl.java | 5 +++++ ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/EfficiencyVO.java | 4 ++++ ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java | 4 ++++ 3 files changed, 13 insertions(+), 0 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 6bc00b2..4be4da4 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 @@ -112,6 +112,10 @@ a.setRatio(1.0 - ((double) efficiencyDto.getErrorNumber() / (double) efficiencyDto.getNumber())); return a; }).collect(Collectors.toList()); + efficiencyVOS.add(new EfficiencyVO("搴楀缁忚惀", 0, 0.0)); + efficiencyVOS.add(new EfficiencyVO("娌胯鏅炬檼", 0, 0.0)); + efficiencyVOS.add(new EfficiencyVO("鏃犵収缁忚惀娓稿晢", 0, 0.0)); + efficiencyVOS.add(new EfficiencyVO("杩濊鎾戜紴", 0, 0.0)); return CommonResult.success(efficiencyVOS); } diff --git a/ycl-platform/src/main/java/com/ycl/service/apidata/impl/IApiDataServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/apidata/impl/IApiDataServiceImpl.java index 393aa08..bce9182 100644 --- a/ycl-platform/src/main/java/com/ycl/service/apidata/impl/IApiDataServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/apidata/impl/IApiDataServiceImpl.java @@ -2,6 +2,7 @@ import com.ycl.mapper.apidata.ApiDataMapper; import com.ycl.service.apidata.IApiDataService; +import com.ycl.vo.cockpit.aiIot.EfficiencyVO; import com.ycl.vo.cockpit.statisticsEvents.StatisticsEventsVO; import org.springframework.stereotype.Service; @@ -25,6 +26,10 @@ @Override public List<StatisticsEventsVO.ArithmeticVO> arithmeticEvent(Integer streetId, String beginTime, String endTime) { List<StatisticsEventsVO.ArithmeticVO> list = apiDataMapper.arithmeticEvent(streetId, beginTime, endTime); + list.add(new StatisticsEventsVO.ArithmeticVO("搴楀缁忚惀", 0, 0.0)); + list.add(new StatisticsEventsVO.ArithmeticVO("娌胯鏅炬檼", 0, 0.0)); + list.add(new StatisticsEventsVO.ArithmeticVO("鏃犵収缁忚惀娓稿晢", 0, 0.0)); + list.add(new StatisticsEventsVO.ArithmeticVO("杩濊鎾戜紴", 0, 0.0)); Integer all = list.stream().flatMapToInt(o -> IntStream.of(o.getCount())).sum(); list.stream().forEach(o -> { o.setRatio(new BigDecimal(((double) o.getCount() / (double) all)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); diff --git a/ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/EfficiencyVO.java b/ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/EfficiencyVO.java index 77ed41b..6f5b024 100644 --- a/ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/EfficiencyVO.java +++ b/ycl-platform/src/main/java/com/ycl/vo/cockpit/aiIot/EfficiencyVO.java @@ -1,13 +1,17 @@ package com.ycl.vo.cockpit.aiIot; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import lombok.ToString; import java.math.BigDecimal; @Data @ToString +@AllArgsConstructor +@NoArgsConstructor public class EfficiencyVO { @ApiModelProperty(value = "鐗╄仈缃戣澶囩被鍨�") private String type; -- Gitblit v1.8.0