From fb47fc829e2f081c6aef37e837e9d50e79c9b701 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 27 七月 2022 11:40:34 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 3eb4327..80babab 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
@@ -123,6 +123,23 @@
return temp;
}
+ /**
+ * 鐔欒璁惧鍒楄〃锛堢敤浜庨椤垫暟鎹粺璁★級
+ *
+ * @return
+ */
+ public List<PoleLightemitEntity> listLedOnHome() {
+ List<PoleLightemitEntity> poleLightemitEntityList;
+ //瓒呯
+ if (SecurityUtils.getClientId() == null) {
+ poleLightemitEntityList = poleLightemitDao.listLed(null, null, null);
+ } else {
+ poleLightemitEntityList = poleLightemitDao.listLed(null, SecurityUtils.getUserId(), null);
+ }
+
+ return poleLightemitEntityList;
+ }
+
/**
* 缁戝畾浣跨敤
@@ -223,12 +240,13 @@
}
PoleLightemitEntity xiXun = getOne(Wrappers.lambdaQuery(PoleLightemitEntity.class).eq(PoleLightemitEntity::getLightemitControlCode, lightControlCode));
+ boolean isScreenOpen = false;
if (xiXun != null) {
equipmentInfo.setEquipmentCreateTime(xiXun.getCreateTime());
equipmentInfo.setEquipmentMac(xiXun.getLightemitControlCode());
equipmentInfo.setEquipmentName(xiXun.getLightemitName());
+ isScreenOpen = lightemitUtils.getLedOnLine(xiXun.getLightemitControlCode());
}
- boolean isScreenOpen = lightemitUtils.getLedOnLine(xiXun.getLightemitControlCode());
if (isScreenOpen) {
equipmentInfo.setEquipmentState("鍦ㄧ嚎");
} else {
--
Gitblit v1.9.3