From 1aa2a59a237dbc4c58a5e3d09be2bfeaf1535c8b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 31 八月 2024 21:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 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 7655251..5515b18 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -44,7 +44,7 @@
public BigDecimal monitorQualify(Map<String, Object> param) {
BigDecimal totalMonitors = new BigDecimal((Integer) param.get("totalMonitors"));
BigDecimal qualifyMonitor = new BigDecimal((Integer) param.get("qualifyMonitor"));
- return qualifyMonitor.divide(totalMonitors, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalMonitors) == 0 ? BigDecimal.ZERO : qualifyMonitor.divide(totalMonitors, 4, RoundingMode.HALF_UP);
}
//涓�鏈轰竴妗ｆ敞鍐岀巼鐜�
@@ -53,35 +53,35 @@
BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
//姝ｅ湪鐢ㄧ殑妗ｆ鏁�
BigDecimal useSites = new BigDecimal((Integer) param.get("totalSites") - (Integer) param.get("newSites"));
- return useSites.divide(totalSites, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : useSites.divide(totalSites, 4, RoundingMode.HALF_UP);
}
//妗ｆ鑰冩牳姣�
public BigDecimal archivesRate(Map<String, Object> param) {
BigDecimal allFiles = new BigDecimal((Integer) param.get("allFiles"));
BigDecimal todayFiles = new BigDecimal((Integer) param.get("todayFiles"));
- return todayFiles.divide(allFiles, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(todayFiles) == 0 ? BigDecimal.ZERO : todayFiles.divide(allFiles, 4, RoundingMode.HALF_UP);
}
//鐐逛綅鍦ㄧ嚎鐜�
public BigDecimal siteOnline(Map<String, Object> param) {
BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal onlineSites = new BigDecimal((Integer) param.get("onlineSites"));
- return onlineSites.divide(totalSites, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : onlineSites.divide(totalSites, 4, RoundingMode.HALF_UP);
}
//瑙嗛Osd鍑嗙‘鐜�
public BigDecimal osdAccuracy(Map<String, Object> param) {
BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal osdAccuracySites = new BigDecimal((Integer) param.get("osdAccuracySites"));
- return osdAccuracySites.divide(totalSites, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : osdAccuracySites.divide(totalSites, 4, RoundingMode.HALF_UP);
}
//瑙嗛鏃堕棿鍚堟牸鐜�
public BigDecimal osdTimeAccuracy(Map<String, Object> param) {
BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal timeAccuracySites = new BigDecimal((Integer) param.get("timeAccuracySites"));
- return timeAccuracySites.divide(totalSites, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : timeAccuracySites.divide(totalSites, 4, RoundingMode.HALF_UP);
}
//鐩綍涓�鑷寸巼锛屾瘡瓒呰繃鐧惧垎涔�1鎵�10%
@@ -91,6 +91,7 @@
// 璁＄畻newSites鍗爐otalSites鐨勭櫨鍒嗘瘮鍊嶆暟
BigDecimal percentage = newSites.divide(totalSites, 2, RoundingMode.DOWN).multiply(BigDecimal.valueOf(100));
BigDecimal result = BigDecimal.ONE;
+ //瓒呰繃鐧惧垎涔�1娌★紝瓒呰繃浜嗘墠鎵ｅ垎
if (BigDecimal.ONE.compareTo(percentage) <= 0) {
result = result.subtract(percentage.multiply(new BigDecimal("0.1")));
}
@@ -101,14 +102,14 @@
public BigDecimal viewConnectStability(Map<String, Object> param) {
BigDecimal totalDataSum = new BigDecimal((Integer) param.get("totalDataSum"));
BigDecimal avgCount = (BigDecimal) param.get("avgCount");
- return avgCount.divide(totalDataSum, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalDataSum) == 0 ? BigDecimal.ZERO : avgCount.divide(totalDataSum, 4, RoundingMode.HALF_UP);
}
//鏍囨敞姝ｇ‘鐜�
public BigDecimal infoAccuracy(Map<String, Object> param) {
BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal qualifySiteCount = new BigDecimal((Integer) param.get("qualifySite"));
- return qualifySiteCount.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSitesCount) == 0 ? BigDecimal.ZERO : qualifySiteCount.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
}
//鏁版嵁涓婁紶鍙婃椂鎬�
@@ -117,10 +118,9 @@
BigDecimal delayCount1 = new BigDecimal((Integer) param.get("delayCount1"));
BigDecimal delayCount2 = new BigDecimal((Integer) param.get("delayCount2"));
BigDecimal delayCount3 = new BigDecimal((Integer) param.get("delayCount3"));
-
- BigDecimal result = BigDecimal.ONE.subtract(delayCount1.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(BigDecimal.ONE)
+ BigDecimal result = BigDecimal.ZERO.compareTo(totalCount) == 0 ? BigDecimal.ZERO : delayCount1.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(BigDecimal.ONE)
.add(delayCount2.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.8")))
- .add(delayCount3.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.6"))));
+ .add(delayCount3.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.6")));
return result.setScale(4, RoundingMode.HALF_UP);
}
@@ -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,44 +141,44 @@
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);
}
//鏃堕挓鍑嗙‘鎬�
public BigDecimal clockAccuracy(Map<String, Object> param) {
BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal accuracySites = new BigDecimal((Integer) param.get("accuracySites"));
- return accuracySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSitesCount) == 0 ? BigDecimal.ZERO : accuracySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
}
//url鍙敤鎬�
public BigDecimal urlUsability(Map<String, Object> param) {
BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal urlQualifySites = new BigDecimal((Integer) param.get("urlQualifySites"));
- return urlQualifySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSitesCount) == 0 ? BigDecimal.ZERO : urlQualifySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
}
//澶у浘鍙敤鎬�
public BigDecimal picUsability(Map<String, Object> param) {
BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal picUsabilitySites = new BigDecimal((Integer) param.get("picUsabilitySites"));
- return picUsabilitySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSitesCount) == 0 ? BigDecimal.ZERO : picUsabilitySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
}
//鍥剧墖鍚堟牸鐜�
public BigDecimal dataQualify(Map<String, Object> param) {
BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal picQualifySites = new BigDecimal((Integer) param.get("picQualifySites"));
- return picQualifySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSitesCount) == 0 ? BigDecimal.ZERO : picQualifySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
}
//褰曞儚鍙敤鐜�
public BigDecimal videoUsability(Map<String, Object> param) {
BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal usabilitySites = new BigDecimal((Integer) param.get("usabilitySites"));
- return usabilitySites.divide(totalSites, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : usabilitySites.divide(totalSites, 4, RoundingMode.HALF_UP);
}
//杩斿洖鐪佸巺鍥芥爣鐮侀泦鍚�
@@ -199,7 +199,7 @@
return CollectionUtils.isEmpty(commandImages) ? new ArrayList<>() : commandImages.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
}
- //杩斿洖閲嶇偣鎸囨尌鍥惧儚闆嗗悎
+ //杩斿洖閮ㄧ骇鐐逛綅闆嗗悎
public List<String> getDeptTag() {
List<YwPoint> commandImages = pointMapper.selectByTag(null, null, null, Boolean.TRUE);
return CollectionUtils.isEmpty(commandImages) ? new ArrayList<>() : commandImages.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
@@ -207,7 +207,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