From 6fe040e3e2805c28442090221e9a4597381830d9 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 12 十月 2022 18:07:49 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
index c32ed50..ae6553e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
@@ -36,6 +36,7 @@
public void addAirEquipment(AirEquipmentNongGeng airEquipmentNongGeng) {
AirEquipmentNongGeng one = getOne(Wrappers.lambdaQuery(AirEquipmentNongGeng.class).eq(AirEquipmentNongGeng::getMac, airEquipmentNongGeng.getMac()));
if (one == null) {
+ //TODO
save(airEquipmentNongGeng);
/**
* 娣诲姞鍐滆�曞ぇ姘旇澶� 鏃ュ織璁板綍寮�濮�
@@ -60,13 +61,35 @@
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
}
List<AirEquipmentNongGengBo> airEquipmentBos;
+// if (SecurityUtils.getClientId() == null) {
+// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
+// } else {
+// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
+// }
+
if (SecurityUtils.getClientId() == null) {
airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
} else {
airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
}
- return airEquipmentBos;
+ return null;
+// return airEquipmentBos;
+ }
+
+ /**
+ * 澶ф皵璁惧鍒楄〃锛堝啘鑰曪紝鐢ㄤ簬棣栭〉鏁版嵁缁熻锛�
+ */
+ public List<AirEquipmentNongGengBo> listAirEquipmentOnHome() {
+// List<AirEquipmentNongGengBo> airEquipmentBos;
+// if (SecurityUtils.getClientId() == null) {
+// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
+// } else {
+// airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
+// }
+
+// return airEquipmentBos;
+ return null;
}
/**
--
Gitblit v1.9.3