From 652bbc43722b3eed164609d10dc6967989b253d5 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 18 四月 2022 17:38:32 +0800
Subject: [PATCH] 节目/文件归属问题
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index 51697b0..56aa7f9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -34,6 +34,7 @@
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.vo.PoleBindVO;
+import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.domain.PoleGroupRelation;
@@ -115,10 +116,11 @@
/**
* 缁熻鍦ㄧ嚎鐏潌鏁伴噺
+ *
* @return
*/
- public Map<String,Integer> poleCount() {
- Map<String,Integer> result = new HashMap<>();
+ public Map<String, Integer> poleCount() {
+ Map<String, Integer> result = new HashMap<>();
List<Pole> list = new ArrayList<>();
LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
if (SecurityUtils.getClientId() == null) {
@@ -129,10 +131,26 @@
w.eq(Pole::getUserId, SecurityUtils.getUserId());
});
}
+ //鐏潌
list = list(wrapper);
List<Pole> poles = isOnLine(list);
- result.put("poleOnlineCount",poles.size());
- result.put("poleTotalCount",list.size());
+ result.put("poleOnlineCount", poles.size());
+ result.put("poleTotalCount", list.size());
+ //璇虹摝
+ // SpringContextHolder.getBean(LightService.class).listLight(SecurityUtils.getUserId(), SecurityUtils.getClientId());
+ List<LedPlayerEntity> ledPlayerEntities = SpringContextHolder.getBean(LedPlayerEntityService.class).ledPlayerEntityList(null, null);
+ int munber = 0;
+ for (LedPlayerEntity bean : ledPlayerEntities) {
+ if (bean.getOnlineStatus() == 1) {
+ munber++;
+ }
+ }
+ result.put("novaOnlineCount", munber);
+ result.put("novaTotalCount", ledPlayerEntities.size());
+
+ SpringContextHolder.getBean(C3ChargingService.class).list();
+
+
return result;
}
@@ -155,6 +173,7 @@
);
}
+ PageHelper.startPage(pageNo, pageSize);
list = list(wrapper);
if (param.getGroupid() != null) {
// List<Long> poleIds = new ArrayList<>();
--
Gitblit v1.9.3