From fb842a99734726e628bd0981ccdf80a253534eaa Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 17 五月 2022 17:06:07 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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 7bdce0d..c50620a 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
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
@@ -66,7 +67,6 @@
/**
* 棣栭〉鐏潌缁戝畾淇℃伅
*/
- //TODO
public EquipmentInfomation getBySnAndPlayerSnInfo(String sn) {
EquipmentInfomation equipmentInfo = new EquipmentInfomation();
equipmentInfo.setEquipmentType("璇虹摝LED");
@@ -75,6 +75,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);
@@ -82,11 +85,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.setEquipmentState("绂荤嚎");
+ }
}
return equipmentInfo;
@@ -104,17 +107,16 @@
} else {
list = ledPlayerEntityMapper.ledPlayerEntityList(keyword, SecurityUtils.getUserId());
}
- return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
+ List<List<LedPlayerEntity>> split = CollectionUtil.split(list, 100);
+
+ List<LedPlayerEntity> ledPlayerEntities=null;
+ for (List<LedPlayerEntity> splist : split) {
+ List<LedPlayerEntity> ledPlayerEntitie = SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(splist));
+ if (ledPlayerEntitie != null) {
+ ledPlayerEntities.addAll(ledPlayerEntitie);
+ }
+ }
+ return ledPlayerEntities;
}
-// public List<LedPlayerEntity> ledPlayerEntityList() {
-// List<LedPlayerEntity> list;
-// //瓒呯
-// if (SecurityUtils.getClientId() == null) {
-// list = ledPlayerEntityMapper.ledPlayerEntityList(null, null);
-// } else {
-// list = ledPlayerEntityMapper.ledPlayerEntityList(null, SecurityUtils.getUserId());
-// }
-// return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
-// }
}
--
Gitblit v1.9.3