From 8a5b6b092754685b4da940d2a35a855832f92465 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 四月 2022 16:10:46 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 27d1be0..8d8cdb3 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
@@ -62,6 +62,7 @@
Pole pole = new Pole();
BeanUtils.copyProperties(param, pole);
pole.setPoleCode(generatePoleCode());
+ pole.setDeviceType(-1);
return save(pole);
}
@@ -819,9 +820,12 @@
public Pole getPoleByMac(Long poleId) {
Pole one = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, poleId));
ArrayList<String> macs = new ArrayList<>();
+
macs.add(one.getDeviceCode());
List<DeviceStatus> deviceStatuses = listStatusByDeviceCode(macs);
- if (deviceStatuses.get(0).getStatus() == 0) {
+ if (one.getDeviceCode() == null || one.getDeviceType() == null || one.getDeviceType() == -1) {
+ one.setOnLineState("铏氭嫙鐏潌");
+ } else if (deviceStatuses.get(0).getStatus() == 0) {
one.setOnLineState("绂荤嚎");
} else if (deviceStatuses.get(0).getStatus() == 1) {
one.setOnLineState("鍦ㄧ嚎");
--
Gitblit v1.9.3