From 17e18047a47f43187f590a045b1aebe130459292 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 26 九月 2022 18:12:21 +0800
Subject: [PATCH] changes
---
dao/src/main/resources/mapper/LedPlayerEntityMapper.xml | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/dao/src/main/resources/mapper/LedPlayerEntityMapper.xml b/dao/src/main/resources/mapper/LedPlayerEntityMapper.xml
index 5af41ea..800609d 100644
--- a/dao/src/main/resources/mapper/LedPlayerEntityMapper.xml
+++ b/dao/src/main/resources/mapper/LedPlayerEntityMapper.xml
@@ -26,7 +26,8 @@
<select id="ledPlayerEntityList" resultType="com.sandu.ximon.dao.domain.LedPlayerEntity">
SELECT
- t1.*, t2.pole_id,
+ t1.*,
+ t2.pole_id,
t3.pole_name
FROM
led t1
@@ -34,13 +35,14 @@
AND t2.device_type = 1
LEFT JOIN pole t3 ON t3.id = t2.pole_id
<where>
+ 1=1
<if test="keyword != null and keyword != ''">
AND t1.name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
OR t1.sn LIKE CONCAT(CONCAT('%', #{keyword}), '%')
OR t1.id LIKE CONCAT(CONCAT('%', #{keyword}), '%')
</if>
- <if test="userid != null">
- AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
+ <if test="userId != null">
+ AND (t3.user_id = #{userId} OR t3.client_id = #{userId})
</if>
</where>
</select>
@@ -79,6 +81,33 @@
AND (t2.user_id = #{clientId} OR t2.client_id = #{clientId})
</if>
</select>
+ <select id="ledListByGroupId" resultType="com.sandu.ximon.dao.domain.LedPlayerEntity">
+ SELECT
+ t1.*,
+ t2.pole_id,
+ t3.pole_name
+ FROM
+ led t1
+ LEFT JOIN pole_binding t2 ON t1.sn = t2.device_code
+ AND t2.device_type = 1
+ LEFT JOIN pole t3 ON t3.id = t2.pole_id
+ LEFT JOIN led_nova_group_relation t4 ON t4.nova_id = t1.id
+ LEFT JOIN led_nova_group t5 ON t5.group_id = t4.nova_group_id
+ <where>
+ 1=1
+ <if test="groupId != null">
+ AND t5.group_id=#{groupId}
+ </if>
+ <if test="keyword != null and keyword != ''">
+ AND t1.name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
+ OR t1.sn LIKE CONCAT(CONCAT('%', #{keyword}), '%')
+ OR t1.id LIKE CONCAT(CONCAT('%', #{keyword}), '%')
+ </if>
+ <if test="userId != null">
+ AND (t3.user_id = #{userId} OR t3.client_id = #{userId})
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.3