From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志，修改大屏为查看当前月平均
---
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationUtils.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationUtils.java b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationUtils.java
index 17b93fe..51343fe 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationUtils.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationUtils.java
@@ -1,9 +1,16 @@
package com.ycl.calculate;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ycl.platform.base.CheckIndex;
+import com.ycl.platform.domain.entity.YwPoint;
+import com.ycl.platform.mapper.YwPointMapper;
import constant.ApiConstants;
import constant.CheckConstants;
+import enumeration.general.PublishType;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -11,18 +18,20 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.stream.Collectors;
@Slf4j
public class IndexCalculationUtils {
- //妫�鏌ユ槸鍚﹀瓨鍦ㄥ綋鏃ユ暟鎹�
- public <I extends CheckIndex> I getCheckIndex(String key, List<I> checkIndexList, Class<I> clazz) {
- I checkIndex;
+ //妫�鏌ユ槸鍚﹀瓨鍦ㄥ綋鏃ユ暟鎹�
+ public <T extends CheckIndex> T getCheckIndex(String key, List<T> checkIndexList, Class<T> clazz) {
+ T checkIndex;
// 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁
- Optional<I> existingIndex = checkIndexList.stream()
+ Optional<T> existingIndex = checkIndexList.stream()
.filter(index -> key.startsWith(ApiConstants.Province) ?
CheckConstants.Examine_Tag_Province.equals(index.getExamineTag()) && key.split("_")[1].equals(index.getDeptId().toString())
+ : key.startsWith(ApiConstants.Dept) ? CheckConstants.Examine_Tag_Dept.equals(index.getExamineTag()) && key.split("_")[1].equals(index.getDeptId().toString())
: CheckConstants.Examine_Tag_County.equals(index.getExamineTag()) && key.equals(index.getDeptId().toString()))
.findFirst();
@@ -31,9 +40,11 @@
} else {
try {
checkIndex = clazz.getDeclaredConstructor().newInstance();
- checkIndex.setDeptId(key.startsWith(ApiConstants.Province) ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key));
- checkIndex.setExamineTag(key.startsWith(ApiConstants.Province) ? CheckConstants.Examine_Tag_Province : CheckConstants.Examine_Tag_County);
+ checkIndex.setDeptId(key.startsWith(ApiConstants.Province) || key.startsWith(ApiConstants.Dept) ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key));
+ checkIndex.setExamineTag(key.startsWith(ApiConstants.Province) ? CheckConstants.Examine_Tag_Province : key.startsWith(ApiConstants.Dept) ? CheckConstants.Examine_Tag_Dept : CheckConstants.Examine_Tag_County);
checkIndex.setCreateTime(new Date());
+ //榛樿鍙戝竷
+ checkIndex.setPublish(PublishType.PUBLISHED.getCode());
} catch (Exception e) {
checkIndex = null;
log.error("鏃犳硶鍒涘缓 checkIndex 瀹炰緥", e);
@@ -42,7 +53,9 @@
return checkIndex;
}
- /** --------鎸囨爣绠楁硶---------*/
+ /**
+ * --------鎸囨爣绠楁硶---------
+ */
//涓�鏈轰竴妗ｅ悎鏍肩巼
public BigDecimal monitorQualify(Map<String, Object> param) {
@@ -105,9 +118,9 @@
//瑙嗗浘搴撳鎺ョǔ瀹氭��
public BigDecimal viewConnectStability(Map<String, Object> param) {
BigDecimal totalDataSum = new BigDecimal((Integer) param.get("totalDataSum"));
- BigDecimal avgCount = (BigDecimal) param.get("avgCount");
- log.info("瑙嗗浘搴撳鎺ョǔ瀹氭�э紝totalDataSum锛歿}锛宎vgCount锛歿}",totalDataSum,avgCount);
- return BigDecimal.ZERO.compareTo(totalDataSum) == 0 ? BigDecimal.ZERO : avgCount.divide(totalDataSum, 4, RoundingMode.HALF_UP);
+ BigDecimal lastCount = (BigDecimal) param.get("lastCount");
+ log.info("瑙嗗浘搴撳鎺ョǔ瀹氭�э紝totalDataSum锛歿}锛宭astCount锛歿}", totalDataSum, lastCount);
+ return totalDataSum.divide(lastCount, 4, RoundingMode.HALF_UP);
}
//鏍囨敞姝ｇ‘鐜�
--
Gitblit v1.8.0