From 4999af7326b571e936fbbbab017f6a64f87ba5ad Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 10:15:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 20 +-------------------
1 files changed, 1 insertions(+), 19 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 56aa7f9..4beee51 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,7 +34,6 @@
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;
@@ -131,26 +130,10 @@
w.eq(Pole::getUserId, SecurityUtils.getUserId());
});
}
- //鐏潌
list = list(wrapper);
List<Pole> poles = isOnLine(list);
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;
}
@@ -165,7 +148,7 @@
w.eq(Pole::getUserId, SecurityUtils.getUserId());
});
}
- if (!param.getKeyword().isEmpty()) {
+ if (param.getKeyword() != null && !param.getKeyword().isEmpty()) {
wrapper.like(Pole::getPoleCode, param.getKeyword()).or(
wrappers -> {
wrappers.like(Pole::getPoleName, param.getKeyword());
@@ -173,7 +156,6 @@
);
}
- PageHelper.startPage(pageNo, pageSize);
list = list(wrapper);
if (param.getGroupid() != null) {
// List<Long> poleIds = new ArrayList<>();
--
Gitblit v1.9.3