From 4e53338c0c6859a43693f3f690f0c05da888a02e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 11:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
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 c299c65..e93a5dd 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
@@ -75,9 +75,7 @@
*/
public void addAirEquipment(AirEquipment airEquipment) {
AirEquipment one = getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, airEquipment.getMac()));
-// //瀛樺偍璁惧鐘舵�佸埌缂撳瓨
-// RedisUtils.getBean().set(AtmoFunctionCode.AIR_EQUIPMENT_STATE.getCode() + airEquipment.getMac()
-// , 1, 300L);
+
if (one == null) {
save(airEquipment);
/**
@@ -222,6 +220,7 @@
* @return
*/
public A5AtmosphereQuerySensorInfoReportInnerFrame.SensorInfoPackage QuerySensorInfo(String mac) {
+ //TODO
if (StringUtil.strIsNullOrEmpty(mac)) {
throw new BusinessException("鐏潌mac鍙傛暟閿欒锛�");
}
--
Gitblit v1.9.3