From a776ca9959e0c4696db0ab96cb59efcfe4061201 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 14 九月 2024 17:33:48 +0800
Subject: [PATCH] 运行监控展示数据重构
---
ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java | 23 +----------------------
1 files changed, 1 insertions(+), 22 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java
index b832fb5..dc40d17 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java
@@ -66,30 +66,9 @@
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalMonitors++;
- if (result != null && correct(result)){
+ if (result != null && MonitorQualifyResult.correct(result)){
stats.qualifyMonitor++;
}
- }
- //鍏ㄥ杩攖ure
- private boolean correct(MonitorQualifyResult result) {
- return checkError(result.getName()) &&
- checkError(result.getCivilCode()) &&
- checkError(result.getIp()) &&
- checkError(result.getSerialNumber()) &&
- checkError(result.getMacdz()) &&
- checkError(result.getLatitude()) &&
- checkError(result.getLongitude()) &&
- checkError(result.getSbzt()) &&
- checkError(result.getSxjcjqy()) &&
- checkError(result.getSxjgnlx()) &&
- checkError(result.getJkdwlx()) &&
- checkError(result.getIntegrated_device())
- ;
- }
-
- //妫�鏌ユ寚鏍囷紝姝ｅ父杩斿洖true
- private boolean checkError(MonitorQualifyResult.QualifyResult result) {
- return result.getError() != null && !result.getError();
}
/**
--
Gitblit v1.8.0