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/LedPlayerEntityMapper.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/LedPlayerEntityMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/LedPlayerEntityMapper.java
index 185fd36..988987a 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/LedPlayerEntityMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/LedPlayerEntityMapper.java
@@ -1,5 +1,6 @@
 package com.sandu.ximon.dao.mapper;
 
+import com.sandu.ximon.dao.bo.LEDNovaGroupListBo;
 import com.sandu.ximon.dao.domain.LedPlayerEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -14,7 +15,26 @@
 
     boolean saveLed(LedPlayerEntity ledPlayerEntity);
 
-    List<LedPlayerEntity> ledPlayerEntityList(String keyword, Long userid);
+    /**
+     * 鐢ㄤ簬闄ゅ垪琛ㄥ睍绀轰互澶栫殑(鏂板浜嗗垎缁勬搷浣�  涓轰笉褰卞搷鍏朵粬  鏂板ledListByGroupId)
+     * @param keyword
+     * @param userId
+     * @return
+     */
+    List<LedPlayerEntity> ledPlayerEntityList(String keyword, Long userId);
+
+    /**
+     * 鐢ㄤ簬鍒楄〃灞曠ず
+     * @param keyword
+     * @param userId
+     * @param groupId
+     * @return
+     */
+    List<LedPlayerEntity> ledListByGroupId(String keyword, Long userId,Long groupId);
+
+    List<LedPlayerEntity> ledPlayerEntityListOnBinding(String keyword, Long userid);
+
+    List<LEDNovaGroupListBo> getListByGroupId(Long groupId,Long clientId);
 }
 
 

--
Gitblit v1.9.3