From 01b3916c90a92501df4bf992d3a686178eb240dd Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 11 五月 2022 16:06:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 13792db..7bdce0d 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
@@ -9,12 +10,10 @@
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
-import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.LedPlayerEntityMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -50,7 +49,7 @@
public LedPlayerEntity getBySnAndPlayerSn(String sn) {
LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
if (one == null) {
- throw new RuntimeException("璇虹摝璁惧涓嶅瓨鍦�");
+ throw new BusinessException("璇虹摝璁惧涓嶅瓨鍦�");
}
List list = new ArrayList();
list.add(one);
@@ -76,9 +75,18 @@
}
LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
+ List<LedPlayerEntity> list = new ArrayList<>();
+ list.add(one);
+ List<LedPlayerEntity> ledPlayerEntities = vnnoxAPIUtil.syncCurrentInfo(list);
+ Integer onlineStatus = ledPlayerEntities.get(0).getOnlineStatus();
if (one != null) {
equipmentInfo.setEquipmentMac(one.getSn());
equipmentInfo.setEquipmentName(one.getName());
+ if (onlineStatus == 0) {
+ equipmentInfo.setEquipmentState("鍦ㄧ嚎");
+ }else {
+ equipmentInfo.setEquipmentName("绂荤嚎");
+ }
}
return equipmentInfo;
--
Gitblit v1.9.3