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 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 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 445080b..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,14 +1,16 @@
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;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.security.SecurityUtils;
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;
@@ -48,7 +50,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);
@@ -62,9 +64,42 @@
return one;
}
+ /**
+ * 棣栭〉鐏潌缁戝畾淇℃伅
+ */
+ public EquipmentInfomation getBySnAndPlayerSnInfo(String sn) {
+ EquipmentInfomation equipmentInfo = new EquipmentInfomation();
+ equipmentInfo.setEquipmentType("璇虹摝LED");
+ if (sn == null || sn.trim().length() == 0) {
+ return equipmentInfo;
+ }
+
+ 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);
+ Integer onlineStatus = ledPlayerEntities.get(0).getOnlineStatus();
+ if (one != null) {
+ equipmentInfo.setEquipmentMac(one.getSn());
+ equipmentInfo.setEquipmentName(one.getName());
+ if (onlineStatus == 0) {
+ equipmentInfo.setEquipmentState("鍦ㄧ嚎");
+ } else {
+ equipmentInfo.setEquipmentState("绂荤嚎");
+ }
+ }
+
+ return equipmentInfo;
+ }
+
public List<LedPlayerEntity> ledPlayerEntityList(BaseConditionVO baseConditionVO, String keyword) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
List<LedPlayerEntity> list;
//瓒呯
if (SecurityUtils.getClientId() == null) {
@@ -72,7 +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;
}
}
--
Gitblit v1.9.3