From 930f0e76c430a3450144aedac9628b3e9af2ed9d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 14 二月 2022 09:48:00 +0800
Subject: [PATCH] 功能完善

---
 dao/src/main/resources/mapper/BroadcastV2TaskTerminalMapper.xml |   62 ++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/dao/src/main/resources/mapper/BroadcastV2TaskTerminalMapper.xml b/dao/src/main/resources/mapper/BroadcastV2TaskTerminalMapper.xml
index fd5d8c9..9444fcd 100644
--- a/dao/src/main/resources/mapper/BroadcastV2TaskTerminalMapper.xml
+++ b/dao/src/main/resources/mapper/BroadcastV2TaskTerminalMapper.xml
@@ -5,16 +5,49 @@
 <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">
-        task_id,terminal_id
+        id,task_id,terminal_id
     </sql>
+
+
+
+    <insert id="insertTask">
+        INSERT INTO
+            broadcast_v2_task_terminal ( task_id, terminal_id )
+        VALUES
+            (
+                #{taskId}, #{terminalId}
+            )
+    </insert>
+    <!-- <insert id="insertTaskTerminal"
+             parameterType="java.util.List&lt;com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal&gt;">
+         INSERT INTO
+         broadcast_v2_task_terminal ( task_id, terminal_id )
+         VALUES
+         <foreach collection="list" item="item" index="index" separator=",">
+             (
+             #{item.taskId}, #{item.terminalId}
+             )
+         </foreach>
+     </insert>-->
+
     <delete id="deleteByTaskId" parameterType="java.lang.Integer">
-        delete from broadcast_v2_task_terminal where task_id=#{taskId}
+        delete
+        from
+        broadcast_v2_task_terminal
+        <!-- <if test="_parameter !=null" >
+              and task_id=#{taskId,jdbcType=INTEGER}
+         </if >-->
+        where
+        task_id=#{taskId}
     </delete>
+
+
+
 
     <select id="listAll" resultType="com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity">
         SELECT
@@ -29,7 +62,7 @@
         </if>
     </select>
 
-    <select id="getBroadcastTerminalList" resultType="com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity">
+    <select id="getBroadcastTerminalList" resultType="com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo">
         SELECT
         t1.*, t2.pole_id,
         t3.pole_name
@@ -39,25 +72,9 @@
         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}), '%')
+                OR t1.terminal_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
             </if>
             <if test="clientId != null">
                 AND t3.client_id = #{clientId}
@@ -67,4 +84,5 @@
             </if>
         </where>
     </select>
+
 </mapper>

--
Gitblit v1.9.3