From 8afcc37e0de5aa3ca3cc3f175f180e9339f60424 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 17 四月 2026 15:11:52 +0800
Subject: [PATCH] update
---
admin-server/src/main/java/com/estate/expert/admin/stat/report/data/DeviceReportData.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/DeviceReportData.java b/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/DeviceReportData.java
index 2c058fe..0608bee 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/DeviceReportData.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/DeviceReportData.java
@@ -34,7 +34,7 @@
Map<String, Long> deviceProblemHazardCounts;
- Map<String, Long> deviceProblemCheckCounts;
+ Map<Integer, Long> deviceCheckCounts;
/**
* 生成报告数据
@@ -264,10 +264,11 @@
}
private long getDeviceProblemCheckCount(ErrorRecord record) {
- if (deviceProblemCheckCounts == null) {
+ Integer deviceId = record != null && record.getDevice() != null ? record.getDevice().getId() : null;
+ if (deviceId == null || deviceCheckCounts == null) {
return 0L;
}
- return deviceProblemCheckCounts.getOrDefault(buildDeviceProblemKey(record), 0L);
+ return Math.max(deviceCheckCounts.getOrDefault(deviceId, 0L), 0L);
}
private String buildDeviceProblemKey(ErrorRecord record) {
--
Gitblit v1.7.1