From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 dao/src/main/java/com/sandu/ximon/dao/mapper/LightMapper.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/LightMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/LightMapper.java
index b25282a..e045b5d 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/LightMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/LightMapper.java
@@ -16,10 +16,27 @@
      * 鏈嶅姟鍣ㄨ幏鍙栬矾鐏垪琛�
      *
      * @param clientId 瀹㈡埛id
-     * @param keyword 鍏抽敭瀛�
+     * @param keyword  鍏抽敭瀛�
      * @return 璺伅鍒楄〃
      */
     List<LightBo> listLight(Long clientId, String keyword);
+
+    /**
+     * 鑾峰彇鐢ㄦ埛鎵�鎷ユ湁鐨勭伅鏉嗕笂鐨勮矾鐏痗ode
+     *
+     * @param userId
+     * @return
+     */
+    List<String> listCode(Long userId, String keyword, String deviceCode);
+
+
+    /***
+     * 鐢ㄥ湪缁戝畾璁惧
+     * @param clientId
+     * @param keyword
+     * @return
+     */
+    List<LightBo> listLightOnBinding(Long clientId, String keyword);
 }
 
 

--
Gitblit v1.9.3