From 8d1d546ad729da0e809e17e8161376adcc662c96 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 21 一月 2026 11:51:36 +0800
Subject: [PATCH] update代码合并
---
admin-server/src/main/java/com/estate/expert/admin/stat/report/data/DeviceReportData.java | 10 +++++++---
1 files changed, 7 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 16069c5..ab88923 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
@@ -14,6 +14,7 @@
import org.springframework.util.StringUtils;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
@@ -195,7 +196,7 @@
List<Object> result = new ArrayList<>();
JSONObject info = new JSONObject();
- info.put("设备编号", device.getName());
+ info.put("设备编号", device.getManufacturerNumber());
var errorCounts = deviceRes.root().getData().getTotalErrorCounts();
info.put("一级隐患", errorCounts[0]);
@@ -220,7 +221,7 @@
List<Object> result = new ArrayList<>();
JSONObject info = new JSONObject();
- info.put("设备编号", device.getName());
+ info.put("设备编号", device.getManufacturerNumber());
info.put("问题", buildDeviceErrorInfo(device));
result.add(info);
@@ -254,7 +255,10 @@
* @return 设备记录
*/
private List<ErrorRecord> buildDeviceRecords(Device device){
- return records.stream().filter(r -> r.getDevice().getId().equals(device.getId())).toList();
+ return records.stream()
+ .filter(r -> r.getDevice().getId().equals(device.getId()))
+ .sorted(Comparator.comparing(r -> r.getLevel() != null ? r.getLevel().ordinal() : ErrorLevel.P4.ordinal()))
+ .toList();
}
--
Gitblit v1.7.1