From a3ff160ff0e25bf0802aa5f14d651776b6652cdc Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期一, 04 八月 2025 16:03:17 +0800
Subject: [PATCH] feat(dry): 更新干燥设备接口和实时数据处理
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/MobileController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/MobileController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/MobileController.java
index 4fcdc30..4ec431f 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/MobileController.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/MobileController.java
@@ -167,12 +167,23 @@
String st = client.getString("connectedAt");
vo.setUpTime(st);
vo.setClientId(clientid);
+ }else{
+ vo.setClientId(clientid);
+ vo.setOnline(false);
}
return vo;
}).collect(Collectors.toList());
//鎺掑簭
- collect.sort(Comparator.comparing(obj -> obj.getCode(), Comparator.nullsLast(Comparator.naturalOrder())));
- collect.sort(Comparator.comparing(obj -> obj.getOnline(), Comparator.nullsLast(Comparator.naturalOrder())));
+ collect.sort(
+ Comparator.comparing(
+ MoEquVo::getOnline,
+ Comparator.nullsLast(Comparator.reverseOrder()) // true 鍦ㄥ墠锛宖alse 鍦ㄥ悗锛宯ull 鏈�鍚�
+ )
+ .thenComparing(
+ DryEquipment::getCode,
+ Comparator.nullsLast(Comparator.naturalOrder()) // code 鍗囧簭锛宯ull 鏈�鍚�
+ )
+ );
BeanUtils.copyProperties(pageList, page);
page.setRecords(collect);
}
--
Gitblit v1.9.3