From 490e61bcf958e840f221f8d21d0a54ac7c99a7c4 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 06 一月 2022 13:40:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/resources/mapper/BroadcastV2TaskTerminalMapper.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/dao/src/main/resources/mapper/BroadcastV2TaskTerminalMapper.xml b/dao/src/main/resources/mapper/BroadcastV2TaskTerminalMapper.xml
index 594df88..fd5d8c9 100644
--- a/dao/src/main/resources/mapper/BroadcastV2TaskTerminalMapper.xml
+++ b/dao/src/main/resources/mapper/BroadcastV2TaskTerminalMapper.xml
@@ -5,8 +5,8 @@
<mapper namespace="com.sandu.ximon.dao.mapper.BroadcastV2TaskTerminalMapper">
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal">
- <result property="taskId" column="task_id" jdbcType="INTEGER"/>
- <result property="terminalId" column="terminal_id" jdbcType="INTEGER"/>
+ <result property="taskId" column="task_id" jdbcType="INTEGER"/>
+ <result property="terminalId" column="terminal_id" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
@@ -15,4 +15,56 @@
<delete id="deleteByTaskId" parameterType="java.lang.Integer">
delete from broadcast_v2_task_terminal where task_id=#{taskId}
</delete>
+
+ <select id="listAll" resultType="com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity">
+ SELECT
+ a.*, b.pole_name
+ FROM
+ broadcast_v2_terminal a
+ LEFT JOIN pole b ON a.streetlight_id = b.id
+ WHERE
+ 1 = 1
+ <if test="terminalName != null and terminalName != ''">
+ AND a.terminal_name like '%${terminalName}%'
+ </if>
+ </select>
+
+ <select id="getBroadcastTerminalList" resultType="com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity">
+ SELECT
+ t1.*, t2.pole_id,
+ t3.pole_name
+ FROM
+ broadcast_v2_terminal t1
+ LEFT JOIN pole_binding t2 ON t1.id = t2.device_code
+ AND t2.device_type = 5
+ LEFT JOIN pole t3 ON t3.id = t2.pole_id
+ <where>
+ t1.id IN
+ <foreach collection="listBroadcastTerminalId" open="(" close=")" item="airId" separator=",">
+ #{airId}
+ </foreach>
+ </where>
+ </select>
+ <select id="listBroadcastV2TerminalId" resultType="java.lang.Long">
+ SELECT
+ t1.*
+ FROM
+ broadcast_v2_terminal t1
+ <if test="keyword != null and keyword != ''">
+ LEFT JOIN pole_binding t2 ON t1.id = t2.device_code
+ AND t2.device_type = 5
+ LEFT JOIN pole t3 ON t3.id = t2.pole_id
+ </if>
+ <where>
+ <if test="keyword != null and keyword != ''">
+ AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
+ </if>
+ <if test="clientId != null">
+ AND t3.client_id = #{clientId}
+ </if>
+ <if test="bindingState != 2">
+ AND t1.bind_states = #{bindingState}
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.3