From 26e9d2d7953bcb8eecaa9f7ce0527abf64f73d0f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 02 八月 2024 10:39:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 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 6d5d7b7..cdd439c 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -2,18 +2,19 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ycl.platform.base.CheckIndex;
+import com.ycl.platform.domain.entity.CheckIndexCar;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
import com.ycl.platform.service.ITMonitorService;
+import constant.CheckConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -22,9 +23,6 @@
*/
@Component
public class IndexCalculationServe {
-
- @Autowired
- private ITMonitorService monitorService;
//鐐逛綅鍦ㄧ嚎鐜�
public BigDecimal siteOnline(Map<String, Object> param) {
@@ -60,10 +58,55 @@
.add(delayCount3.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.6")));
return result.setScale(4, RoundingMode.HALF_UP);
}
+
+ //鏁版嵁瀹屾暣鎬�
+ public BigDecimal dataIntegrity(Map<String, Object> param){
+ BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
+ 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)
+ .add(importantIntegritySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP));
+ return result.setScale(4, RoundingMode.HALF_UP);
+ }
+
//杩斿洖鐪佸巺鍥芥爣鐮侀泦鍚�
public List<String> getProvince() {
// TODO: 鍒嗙渷鍘呭競灞� 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹�
List<String> list = new ArrayList<>();
return list;
}
+
+ //杩斿洖閲嶇偣鐐逛綅闆嗗悎
+ public List<String> getImportant() {
+ // TODO: 閲嶇偣鐐逛綅 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹�
+ List<String> list = new ArrayList<>();
+ return list;
+ }
+
+ //妫�鏌ユ槸鍚﹀瓨鍦ㄥ綋鏃ユ暟鎹�
+ public <T extends CheckIndex> T getCheckIndex(String key, List<T> checkIndexList) {
+ T checkIndex;
+
+ // 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁
+ Optional<T> existingIndex = checkIndexList.stream()
+ .filter(index -> key.equals(index.getDeptId().toString()) &&
+ (key.startsWith("Province_") ? CheckConstants.Examine_Tag_City.equals(index.getExamineTag())
+ : CheckConstants.Examine_Tag_County.equals(index.getExamineTag())))
+ .findFirst();
+
+ if (existingIndex.isPresent()) {
+ checkIndex = existingIndex.get();
+ } else {
+ try {
+ checkIndex = (T) CheckIndexCar.class.getDeclaredConstructor().newInstance();
+ checkIndex.setDeptId(key.startsWith("Province_") ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key));
+ 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);
+ }
+ }
+ return checkIndex;
+ }
}
--
Gitblit v1.8.0