From e5f711997c3247dc74d5a820673cc911bd2fbcf4 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 11 三月 2022 15:42:42 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
index ced56c0..bb365cd 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -185,14 +185,7 @@
}
*/
- public List<PoleLightemitEntity> ledList() {
-// Wrappers.lambdaQuery()
- List<PoleLightemitEntity> list = list();
- return ledOnlineCheck(list);
- }
-
-
- public List<PoleLightemitEntity> ledOnlineCheck(List<PoleLightemitEntity> list) {
+ public List<PoleLightemitEntity> ledOnline(List<PoleLightemitEntity> list) {
List<PoleLightemitEntity> onLineList = new ArrayList<>();
for (PoleLightemitEntity poleLightemitEntity : list) {
poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true"));
@@ -201,6 +194,14 @@
}
}
return onLineList;
+ }
+
+
+ public void ledOnlineCheck(List<PoleLightemitEntity> list) {
+ for (PoleLightemitEntity poleLightemitEntity : list) {
+ poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true"));
+
+ }
}
@@ -230,7 +231,7 @@
if (b && poleLightemit.getStreetlightId() != null) {
//鍏堝垹闄ょ粦瀹氬叧绯�
- poleBindingService.unBindPole(poleLightemit.getLightemitControlCode());
+ poleBindingService.unBindPole(null, poleLightemit.getLightemitControlCode());
//鍐嶇粦瀹�
PoleBindingParam poleBindingParam = new PoleBindingParam();
poleBindingParam.setDeviceCode(poleLightemit.getLightemitControlCode());
@@ -250,7 +251,7 @@
for (PoleLightemitEntity poleLightemitEntitie : poleLightemitEntities) {
if (poleLightemitEntitie.getLightemitControlCode() != null) {
//鍒犻櫎缁戝畾鍏崇郴//鍏堝垹闄ょ粦瀹氬叧绯�
- poleBindingService.unBindPole(poleLightemitEntitie.getLightemitControlCode());
+ poleBindingService.unBindPole(null, poleLightemitEntitie.getLightemitControlCode());
}
}
}
--
Gitblit v1.9.3