From 4b33796be3887c81fa40fba2f55dce4489cff041 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 01 四月 2026 14:55:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/estate_expert
---
admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java b/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java
index c5aea16..c927173 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/SystemReportData.java
@@ -17,6 +17,7 @@
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -33,6 +34,10 @@
protected FuzzyResult sysResult;
protected ScoreResult scoreResult;
+
+ Map<Integer, Long> problemHazardCounts;
+
+ Map<Integer, Long> problemCheckCounts;
// 评估结果
@Override
@@ -200,11 +205,29 @@
for(var record : nodeRecords){
var subItem = buildRecordDetail(record);
subItem.put("项目级别", errorNodeName(record));
+ subItem.put("同类隐患出现频次", getProblemHazardCount(record));
+ subItem.put("检查频次", getProblemCheckCount(record));
errors.add(subItem);
}
return errors;
}
+ private long getProblemHazardCount(ErrorRecord record) {
+ var problemId = record != null && record.getProblem() != null ? record.getProblem().getId() : null;
+ if (problemId == null || problemHazardCounts == null) {
+ return 0L;
+ }
+ return problemHazardCounts.getOrDefault(problemId, 0L);
+ }
+
+ private long getProblemCheckCount(ErrorRecord record) {
+ var problemId = record != null && record.getProblem() != null ? record.getProblem().getId() : null;
+ if (problemId == null || problemCheckCounts == null) {
+ return 0L;
+ }
+ return problemCheckCounts.getOrDefault(problemId, 0L);
+ }
+
/**
* 构建错误节点名称
* @param record 记录
--
Gitblit v1.7.1