From 2c52eaf28f9b8a666547e1307a76c3032598e57f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 11 五月 2022 16:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
index 310c2d8..fa11ba3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
@@ -74,6 +74,9 @@
}
LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
+ if (one == null) {
+ return equipmentInfo;
+ }
List<LedPlayerEntity> list = new ArrayList<>();
list.add(one);
List<LedPlayerEntity> ledPlayerEntities = vnnoxAPIUtil.syncCurrentInfo(list);
@@ -81,11 +84,11 @@
if (one != null) {
equipmentInfo.setEquipmentMac(one.getSn());
equipmentInfo.setEquipmentName(one.getName());
- if (onlineStatus == 0) {
+ if (onlineStatus == 0) {
equipmentInfo.setEquipmentState("鍦ㄧ嚎");
- }else {
- equipmentInfo.setEquipmentName("绂荤嚎");
- }
+ } else {
+ equipmentInfo.setEquipmentName("绂荤嚎");
+ }
}
return equipmentInfo;
--
Gitblit v1.9.3