From ab060213fe5b62ba8bf9b87c8a93ba7e9fea05db Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期六, 02 四月 2022 11:39:01 +0800
Subject: [PATCH] 单灯数据导出
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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..758790f 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());
--
Gitblit v1.9.3