From f2dfd5e6fbbb9c4e96e91c86be0bb6f7a44d87c3 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 11:56:21 +0800
Subject: [PATCH] LED屏列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 5 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 de219f5..0e5c4a1 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
@@ -44,10 +44,7 @@
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -91,6 +88,8 @@
if (pole == null) {
throw new BusinessException("鏈壘鍒拌鐏潌");
}
+ // 鍒犻櫎鐏潌缁戝畾鍏崇郴
+ poleBindingService.remove(Wrappers.<PoleBinding>lambdaQuery().eq(PoleBinding::getPoleId, poleId));
return removeById(poleId);
}
@@ -114,13 +113,39 @@
}
+ /**
+ * 缁熻鍦ㄧ嚎鐏潌鏁伴噺
+ * @return
+ */
+ 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) {
+ wrapper = Wrappers.lambdaQuery(Pole.class);
+ } else {
+ wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()).or(
+ w -> {
+ w.eq(Pole::getUserId, SecurityUtils.getUserId());
+ });
+ }
+ list = list(wrapper);
+ List<Pole> poles = isOnLine(list);
+ result.put("onlineCount",poles.size());
+ result.put("totalCount",list.size());
+ return result;
+ }
+
public List<Pole> queryAllStatesAndList(Integer pageNo, Integer pageSize, PoleStatesParam param) {
List<Pole> list = new ArrayList<>();
LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
if (SecurityUtils.getClientId() == null) {
wrapper = Wrappers.lambdaQuery(Pole.class);
} else {
- wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId());
+ wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()).or(
+ w -> {
+ w.eq(Pole::getUserId, SecurityUtils.getUserId());
+ });
}
if (!param.getKeyword().isEmpty()) {
wrapper.like(Pole::getPoleCode, param.getKeyword()).or(
@@ -217,6 +242,26 @@
return list;
}
+
+ /**
+ * 鍦ㄧ嚎鐏潌
+ *
+ * @param list
+ * @param
+ * @return
+ */
+ public List<Pole> isOnLine(List<Pole> list) {
+ setOnline(list);
+ List<Pole> online = new ArrayList<>();//鍦ㄧ嚎
+ list.forEach(onLinePole -> {
+ if (("ONLINE").equals(onLinePole.getOnLineState())) {
+ online.add(onLinePole);
+ }
+ });
+
+ return online;
+ }
+
/**
* 鏌ヨ缁戝畾鐘舵��
*
--
Gitblit v1.9.3