From b890afe0d93b9856bcfe6829ec51a69e232ce0d7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 31 八月 2024 18:01:27 +0800
Subject: [PATCH] 图像安全资源管理整合，车辆抓拍数据完整和准确计算公式修改
---
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
index 80c425b..ccfced7 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -130,9 +130,9 @@
BigDecimal importantTotalSites = new BigDecimal((Integer) param.get("importantTotalSites"));
BigDecimal integritySites = new BigDecimal((Integer) param.get("integritySites"));
BigDecimal importantIntegritySites = new BigDecimal((Integer) param.get("importantIntegritySites"));
- BigDecimal result = integritySites.divide(totalSites, 10, RoundingMode.HALF_UP)
- .multiply(importantIntegritySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP));
- return result.setScale(4, RoundingMode.HALF_UP);
+ BigDecimal total = BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : integritySites.divide(totalSites, 10, RoundingMode.HALF_UP);
+ BigDecimal important = BigDecimal.ZERO.compareTo(importantTotalSites) == 0 ? BigDecimal.ZERO : importantIntegritySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP);
+ return total.multiply(important).setScale(4, RoundingMode.HALF_UP);
}
//杞﹁締鏁版嵁瀹屾暣鎬�
@@ -141,9 +141,9 @@
BigDecimal importantTotalSites = new BigDecimal((Integer) param.get("importantTotalSites"));
BigDecimal accuracySites = new BigDecimal((Integer) param.get("accuracySites"));
BigDecimal importantAccuracySites = new BigDecimal((Integer) param.get("importantAccuracySites"));
- BigDecimal result = accuracySites.divide(totalSites, 10, RoundingMode.HALF_UP)
- .add(importantAccuracySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP));
- return result.setScale(4, RoundingMode.HALF_UP);
+ BigDecimal total = BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : accuracySites.divide(totalSites, 10, RoundingMode.HALF_UP);
+ BigDecimal important = BigDecimal.ZERO.compareTo(importantTotalSites) == 0 ? BigDecimal.ZERO : importantAccuracySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP);
+ return total.multiply(important).setScale(4, RoundingMode.HALF_UP);
}
//鏃堕挓鍑嗙‘鎬�
@@ -201,7 +201,8 @@
//杩斿洖monitor
public List<String> getMonitorFromMongo() {
- Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ Date yesterday = DateUtils.addDays(new Date(), -1);
+ Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class);
return CollectionUtils.isEmpty(oneMachineFileResults) ? new ArrayList<>() : oneMachineFileResults.stream().map(result -> result.getSerialNumber().getValue()).collect(Collectors.toList());
--
Gitblit v1.8.0