From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/service/apidata/impl/IApiDataServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
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..97fc923 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,11 +2,13 @@
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;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.IntStream;
@@ -25,9 +27,24 @@
@Override
public List<StatisticsEventsVO.ArithmeticVO> arithmeticEvent(Integer streetId, String beginTime, String endTime) {
List<StatisticsEventsVO.ArithmeticVO> list = apiDataMapper.arithmeticEvent(streetId, beginTime, endTime);
+ List<String> dic = Arrays.asList("鏃犵収缁忚惀娓稿晢", "鍗犻亾缁忚惀", "搴楀缁忚惀", "闈炴満鍔ㄨ溅涔卞仠鏀�", "杩濊鎾戜紴", "娌胯鏅炬寕", "鏈哄姩杞︿贡鍋滄斁", "缇ゅ彂鎬т簨浠�");
+ while (list.size() < 8) {
+ for (int i = 0; i < dic.size(); i++) {
+ int finalI = i;
+ long count = list.stream().filter(o -> o.getName().equals(dic.get(finalI))).count();
+ if (count == 0) {
+ list.add(new StatisticsEventsVO.ArithmeticVO(dic.get(finalI), 0, 0.0));
+ break;
+ }
+ }
+ }
+ // 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());
+ o.setRatio(new BigDecimal(((double) o.getCount() / (double) all)).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue());
});
return list;
}
--
Gitblit v1.8.0