From bc940795faa161a988a7df3f27072bb426f17fdb Mon Sep 17 00:00:00 2001
From: LHN <31457034@qq.com>
Date: 星期三, 19 十月 2022 16:34:09 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java | 6 +++---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 2 +-
dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java | 10 +++++++---
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java b/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
index 482ae23..73a2164 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
@@ -4,19 +4,22 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
import java.io.Serializable;
import java.time.LocalDateTime;
-import lombok.Data;
/**
* 澶ф皵璁惧
+ *
* @TableName air_equipment
*/
-@TableName(value ="air_equipment")
+@TableName(value = "air_equipment")
@Data
public class AirEquipment implements Serializable {
/**
- *
+ *
*/
@TableId(type = IdType.AUTO)
private Long id;
@@ -29,6 +32,7 @@
/**
* MAC鍦板潃澶ф皵
*/
+ @JsonIgnore
private String airMac;
/**
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
index ba65362..8e5bb04 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
@@ -365,14 +365,14 @@
list().forEach(
device -> {
RedisDeviceStatus deviceStatus = new RedisDeviceStatus();
- deviceStatus.setDeviceId(device.getAirMac());
+ deviceStatus.setDeviceId(device.getMac());
- if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + device.getAirMac()) != null) {
+ if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + device.getMac()) != null) {
deviceStatus.setStatus(0);
} else {
deviceStatus.setStatus(1);
}
- redisUtils.set(DeviceRedisKey.AIR + device.getAirMac(), JSON.toJSONString(deviceStatus));
+ redisUtils.set(DeviceRedisKey.AIR + device.getMac(), JSON.toJSONString(deviceStatus));
// redisUtils.delete(DeviceRedisKey.AIR + device.getAirMac());
}
);
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 ad0af4e..bbc90ac 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
@@ -471,7 +471,7 @@
DeviceOnLineCountVO air = new DeviceOnLineCountVO();
airEquipments.forEach(
device -> {
- String s = redisUtils.get(DeviceRedisKey.AIR + device.getAirMac());
+ String s = redisUtils.get(DeviceRedisKey.AIR + device.getMac());
if (s != null) {
RedisDeviceStatus redisDeviceStatus = JSON.parseObject(s, RedisDeviceStatus.class);
if (redisDeviceStatus.getStatus() == 0) {
--
Gitblit v1.9.3