From 4167b21d9f2ad8774c248ef160910bea5311c002 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 13 四月 2022 18:14:10 +0800
Subject: [PATCH] 设备汇总

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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 2bb2a4b..5a993ef 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
@@ -33,11 +33,8 @@
     public List<AirEquipmentBo> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
         Long clientId = SecurityUtils.getClientId();
         PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
-        List<Long> listAirEquipmentId = airEquipmentMapper.listAirEquipmentId(keyword,clientId);
-        if(CollUtil.isEmpty(listAirEquipmentId)){
-            return CollUtil.newArrayList();
-        }
-        List<AirEquipmentBo> airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(listAirEquipmentId);
+
+        List<AirEquipmentBo> airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(keyword,clientId);
         return airEquipmentBos;
     }
 
@@ -66,4 +63,11 @@
         }
         return removeById(Id);
     }
+
+    /**
+     * 鏍规嵁Mac澶ф皵璁惧鏁版嵁璇︽儏
+     */
+    public AirEquipment getAirEquipment(String mac) {
+        return getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, mac));
+    }
 }

--
Gitblit v1.9.3