From b5df1cee65f3e9dcf554efcd3f1642a8c79d1e76 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 30 九月 2024 02:12:24 +0800 Subject: [PATCH] 点位监测更换对象+存入mongo+提取utils --- ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexFace.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexFace.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexFace.java index 244f4f0..13e87b4 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexFace.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexFace.java @@ -83,6 +83,7 @@ //杞崲鎴愬瓧绗︿覆鐢ㄤ簬excel瀵煎嚭 public static CheckIndexFaceVO getExcelVo(@NonNull CheckIndexFace checkIndexFace) { CheckIndexFaceVO checkIndexFaceVo = new CheckIndexFaceVO(); + checkIndexFaceVo.setNum(checkIndexFace.getNum()); checkIndexFaceVo.setScore(checkIndexFace.getScore().setScale(2,RoundingMode.HALF_UP)); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); //閬垮厤鍚堣琛屾姤閿�(鍚堣鏁版嵁 缂哄皯createTimeStr瀛楁 鐩存帴灏哻reateTimeStr璁剧疆涓�"鍚堣") @@ -106,6 +107,7 @@ } /** 鐢ㄤ簬瀵煎嚭璁$畻骞冲潎鍊� */ public static CheckIndexFace calculateAverage(List<CheckIndexFace> checkIndexFaces) { + Integer numSum = 0; BigDecimal scoreSum = BigDecimal.ZERO; BigDecimal totalViewConnectStability = BigDecimal.ZERO; BigDecimal totalSiteOnline = BigDecimal.ZERO; @@ -119,6 +121,7 @@ int count = checkIndexFaces.size(); for (CheckIndexFace indexFace : checkIndexFaces) { + numSum = numSum + (indexFace.getNum() == null? 0:indexFace.getNum()); scoreSum = scoreSum.add(indexFace.getScore() == null ? BigDecimal.ZERO : indexFace.getScore()); totalViewConnectStability = totalViewConnectStability.add(indexFace.getViewConnectStability()); totalSiteOnline = totalSiteOnline.add(indexFace.getSiteOnline()); @@ -133,6 +136,7 @@ result.setCreateTimeStr("鍚堣"); result.setDeptName(checkIndexFaces.get(0).getDeptName()); result.setExamineTag(checkIndexFaces.get(0).getExamineTag()); + result.setNum(numSum/count); result.setScore(scoreSum.divide(BigDecimal.valueOf(count), 2, RoundingMode.HALF_UP)); result.setViewConnectStability(totalViewConnectStability.divide(BigDecimal.valueOf(count), 2, RoundingMode.HALF_UP)); result.setSiteOnline(totalSiteOnline.divide(BigDecimal.valueOf(count), 2, RoundingMode.HALF_UP)); -- Gitblit v1.8.0