From 98dfa3784a8a096a5e5f9abe5fe98f6c1dc39509 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 10 五月 2022 17:26:00 +0800
Subject: [PATCH] Changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 74 +++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 32 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 ad814e4..abb7cc1 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
@@ -286,28 +286,44 @@
);
list = pole;
}
-
- if (param.getBingStates() != 2) {//鏄惁缁戝畾
- list = isBind(list, param);// 缁戝畾/鏈粦瀹�
- if (param.getIsTrue() != 2) {//宸茬粦瀹氱殑鏄惁鏄湡瀹炵伅鏉�
+ //鏄惁缁戝畾
+ if (param.getBingStates() != 2) {
+ // 缁戝畾/鏈粦瀹�
+ list = isBind(list, param);
+ //宸茬粦瀹氱殑鏄惁鏄湡瀹炵伅鏉�
+ if (param.getIsTrue() != 2) {
list = isTrue(list, param);
- if (param.getOnLineStates() != 2) {//缁戝畾鐨勭湡瀹炵伅鏉嗘槸鍚﹀湪绾�
- list = isOnLine(list, param);
- }
- } else {//鍏ㄩ儴鐏潌 瀹炰綋/铏氭嫙
- if (param.getOnLineStates() != 2) { //鏌ヨ鍏ㄩ儴鐏潌鏄惁鍦ㄧ嚎
+ //缁戝畾鐨勭湡瀹炵伅鏉嗘槸鍚﹀湪绾�
+ if (param.getOnLineStates() != 2) {
list = isOnLine(list, param);
}
}
- } else {//鍏ㄩ儴 缁戝畾/鏈粦瀹�
- if (param.getIsTrue() != 2) {// 鍒ゆ柇鐏潌绫诲瀷
- list = isTrue(list, param);// 瀹炰綋/铏氭嫙
- if (param.getOnLineStates() != 2) {// 鐏潌鐨勫湪绾垮垽鏂�
- list = isOnLine(list, param);//鍦ㄧ嚎/绂荤嚎
+ //鍏ㄩ儴鐏潌 瀹炰綋/铏氭嫙
+ else {
+ //鏌ヨ鍏ㄩ儴鐏潌鏄惁鍦ㄧ嚎
+ if (param.getOnLineStates() != 2) {
+ list = isOnLine(list, param);
}
- } else {//鍏ㄧ被鍨嬬伅鏉�
- if (param.getOnLineStates() != 2) {//鍒ゆ柇鍦ㄧ嚎鐘舵��
- list = isOnLine(list, param);//鍦ㄧ嚎/绂荤嚎
+ }
+ }
+ //鍏ㄩ儴 缁戝畾/鏈粦瀹�
+ else {
+ // 鍒ゆ柇鐏潌绫诲瀷
+ if (param.getIsTrue() != 2) {
+ // 瀹炰綋/铏氭嫙
+ list = isTrue(list, param);
+ // 鐏潌鐨勫湪绾垮垽鏂�
+ if (param.getOnLineStates() != 2) {
+ //鍦ㄧ嚎/绂荤嚎
+ list = isOnLine(list, param);
+ }
+ }
+ //鍏ㄧ被鍨嬬伅鏉�
+ else {
+ //鍒ゆ柇鍦ㄧ嚎鐘舵��
+ if (param.getOnLineStates() != 2) {
+ //鍦ㄧ嚎/绂荤嚎
+ list = isOnLine(list, param);
}
}
}
@@ -413,11 +429,14 @@
}
public List<Pole> isTrue(List<Pole> list, PoleStatesParam param) {
- List<Pole> isTrue = new ArrayList<>();//瀹炰綋鐏潌
- List<Pole> isFalse = new ArrayList<>();//铏氭嫙鐏潌
+ //瀹炰綋鐏潌
+ List<Pole> isTrue = new ArrayList<>();
+ //铏氭嫙鐏潌
+ List<Pole> isFalse = new ArrayList<>();
list.forEach(bindwarpper -> {
// Long clientId = bindwarpper.getClientId();
- if (bindwarpper.getDeviceCode() == null) {
+ //鍒ゆ柇鏄惁缁戝畾
+ if (bindwarpper.getDeviceType() == -1) {
isFalse.add(bindwarpper);
} else {
isTrue.add(bindwarpper);
@@ -452,16 +471,13 @@
if (deviceStatuses != null) {
for (Pole post : list) {
for (BatchGetDeviceStateResponse.DeviceStatus deviceStatus : deviceStatuses) {
-// System.out.println("DeviceCode:---------------------"+post.getDeviceCode());
-// System.out.println("DeviceName:---------------------"+deviceStatus.getDeviceName());
+
if (post.getDeviceCode() != null && post.getDeviceCode().equals(deviceStatus.getDeviceName())) {
post.setOnLineState(deviceStatus.getStatus());
-// int size = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, post.getId())).size();
-//// System.out.println("size:----------------------"+size);
-// post.setBindingCount(size);
+
}
}
- // MacCodes.add(post.getDeviceCode());
+
}
}
@@ -475,8 +491,6 @@
* @return
*/
public List<Pole> queryStatesAndList(Integer pageNo, Integer pageSize, String keyword, Long groupid) {
- // List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class).eq(LampPost::getClientId, SecurityUtils.getUserId()));
- //List<Pole> list = list(Wrappers.lambdaQuery(Pole.class));
PageHelper.startPage(pageNo, pageSize);
List<Pole> list = new ArrayList<>();
LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
@@ -501,16 +515,12 @@
List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(MacCodes);
for (Pole post : list) {
for (BatchGetDeviceStateResponse.DeviceStatus deviceStatus : deviceStatuses) {
-// System.out.println("DeviceCode:---------------------"+post.getDeviceCode());
-// System.out.println("DeviceName:---------------------"+deviceStatus.getDeviceName());
if (post.getDeviceCode() != null && post.getDeviceCode().equals(deviceStatus.getDeviceName())) {
post.setOnLineState(deviceStatus.getStatus());
int size = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, post.getId())).size();
-// System.out.println("size:----------------------"+size);
post.setBindingCount(size);
}
}
- // MacCodes.add(post.getDeviceCode());
}
--
Gitblit v1.9.3