From 299b1469c9f19c1d45948bcc050aa37c86c965cd Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 13 六月 2025 17:53:07 +0800
Subject: [PATCH] mdc设备添加图片，设备监控、大屏修改设备图片来源及添加设备状态为故障的类型
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DevicePermissionServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DevicePermissionServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DevicePermissionServiceImpl.java
index ce32abf..28816b1 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DevicePermissionServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DevicePermissionServiceImpl.java
@@ -162,14 +162,20 @@
鏋勫缓浜х嚎鏍戠粨鏋�
*/
private List<MdcEquipmentTree> buildProductionTree(List<String> productionIds, Map<String, MdcProduction> productionMap) {
-
List<MdcProduction> filteredProductions = new ArrayList<>();
productionIds.forEach(id -> {
- MdcProduction production = productionMap.get(id);
- if (production != null) {
- filteredProductions.add(production);
- }
+ MdcProduction production = productionMap.get(id);
+ if (production != null) {
+ filteredProductions.add(production);
+ }
});
+ // 鎸夊垱寤烘椂闂村崌搴忔帓搴忥紙绌哄�兼帓鍦ㄦ渶鍚庯級
+ filteredProductions.sort(
+ Comparator.comparing(
+ MdcProduction::getCreateTime,
+ Comparator.nullsLast(Comparator.naturalOrder()) // 鑷劧椤哄簭鍗冲崌搴�
+ )
+ );
return FindsEquipmentProductionUtil.wrapEquipmentProductionTreeList(filteredProductions);
}
/**
--
Gitblit v1.9.3