XMPoleManager.git

			@@ -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;

			/**

			@@ -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());
			}
			);

			@@ -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) {

	dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史