From 4ac87bb3275667c02bc60012ebb9fc1eeab6da5b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 02 八月 2024 17:12:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 58ff734..aa33b57 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -8,6 +8,7 @@
import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
import com.ycl.platform.service.ITMonitorService;
import constant.CheckConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
@@ -22,6 +23,7 @@
* 璁＄畻鍏紡
*/
@Component
+@Slf4j
public class IndexCalculationServe {
//鐐逛綅鍦ㄧ嚎鐜�
@@ -88,6 +90,27 @@
return 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);
+ }
+
+ //澶у浘鍙敤鎬�
+ 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);
+ }
+
+ //鍥剧墖鍚堟牸鐜�
+ 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);
+ }
+
//杩斿洖鐪佸巺鍥芥爣鐮侀泦鍚�
public List<String> getProvince() {
// TODO: 鍒嗙渷鍘呭競灞� 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹�
@@ -122,7 +145,8 @@
checkIndex.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County);
checkIndex.setCreateTime(new Date());
} catch (Exception e) {
- throw new RuntimeException("鏃犳硶鍒涘缓 CheckIndexCar 瀹炰緥", e);
+ checkIndex = null;
+ log.error("鏃犳硶鍒涘缓 checkIndex 瀹炰緥", e);
}
}
return checkIndex;
--
Gitblit v1.8.0