From 2dd5433edfc33ac48ffd31455820883c305a6ab8 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 四月 2022 16:59:24 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 11 ++++++++++-
1 files changed, 10 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 c72e607..cfd41c4 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
@@ -57,6 +57,7 @@
private final PoleBindingService poleBindingService;
private final PoleGroupRelationService groupRelationService;
private final ClientService clientService;
+ private final PoleMapper poleMapper;
public boolean addPole(PoleParam param) {
Pole pole = new Pole();
@@ -820,9 +821,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("鍦ㄧ嚎");
@@ -846,4 +850,9 @@
// return energy;
// }
+
+ public boolean updateDeviceCode(Long poleId){
+ return poleMapper.updateDeviceCode(poleId);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3