From 7b43c04dd530bdd193e0cf02c4e19ba7c2ee2c11 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 11 五月 2022 10:41:31 +0800
Subject: [PATCH] 设备归属
---
dao/src/main/resources/mapper/MonitorMapper.xml | 84 +++++++++++++++---------------------------
1 files changed, 30 insertions(+), 54 deletions(-)
diff --git a/dao/src/main/resources/mapper/MonitorMapper.xml b/dao/src/main/resources/mapper/MonitorMapper.xml
index a0ef0c1..a94727a 100644
--- a/dao/src/main/resources/mapper/MonitorMapper.xml
+++ b/dao/src/main/resources/mapper/MonitorMapper.xml
@@ -10,83 +10,59 @@
<result property="devicesCode" column="devices_code" jdbcType="VARCHAR"/>
<result property="deviceName" column="device_name" jdbcType="VARCHAR"/>
<result property="deviceType" column="device_type" jdbcType="VARCHAR"/>
- <result property="equipmentStatus" column="equipment_status" jdbcType="INTEGER"/>
+ <result property="equipmentState" column="equipment_state" jdbcType="INTEGER"/>
<result property="isEncrypt" column="is_encrypt" jdbcType="INTEGER"/>
- <result property="workState" column="work_state" jdbcType="INTEGER"/>
<result property="bindingState" column="binding_state" jdbcType="INTEGER"/>
<result property="note" column="note" jdbcType="VARCHAR"/>
<result property="addTime" column="add_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="netAddress" column="net_address" jdbcType="VARCHAR"/>
</resultMap>
- <select id="listMonitorByKeyword" resultType="com.sandu.ximon.dao.domain.Monitor">
- SELECT * FROM (SELECT * FROM (SELECT * FROM monitor AS table1
- WHERE device_serial LIKE CONCAT(CONCAT('%', #{keyword}), '%')
- ) AS table2
- WHERE equipment_status = #{equipmentState1}
- OR equipment_status = #{equipmentState2}) AS table3
- WHERE binding_state = #{bindingState1} OR binding_state = #{bindingState2};
- </select>
- <select id="listMonitorByKeyword1" resultType="com.sandu.ximon.dao.domain.Monitor">
+
+ <select id="listMonitorByIds" resultType="com.sandu.ximon.dao.bo.MonitorBo">
SELECT
- t1.*, t2.pole_id,
- t3.pole_name
+ t1.*, t2.pole_id,
+ t3.pole_name, t3.province,t3.city,t3.region,t3.address
FROM
- monitor t1
+ monitor t1
LEFT JOIN pole_binding t2 ON t1.device_serial = t2.device_code
AND t2.device_type = 7
LEFT JOIN pole t3 ON t3.id = t2.pole_id
- WHERE
- t1.device_serial LIKE CONCAT(CONCAT('%', #{keyword}), '%')
- OR t2.pole_id LIKE CONCAT(CONCAT('%', #{keyword}), '%')
- OR t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
- AND binding_state = #{bindingState1}
- OR binding_state = #{bindingState2}
- ORDER BY
- t1.id DESC
+ <where>
+ <if test="list != null">
+ t1.device_serial IN
+ <foreach collection="list" open="(" close=")" separator="," item="deviceCode">
+ #{deviceCode}
+ </foreach>
+ </if>
+ <if test="equipmentState != 2">
+ AND t1.equipment_state = #{equipmentState}
+ </if>
+ </where>
</select>
-
- <select id="listMonitorId" resultType="java.lang.Long">
+ <select id="listMonitorDeviceSerial1" resultType="com.sandu.ximon.dao.bo.MonitorBo">
SELECT
- MAX(t1.id) AS monitor_id
+ t1.*, t2.pole_id,
+ t3.pole_name, t3.province,t3.city,t3.region,t3.address
FROM
monitor t1
- <if test="keyword != null and keyword != ''">
- LEFT JOIN pole_binding t2 ON t1.device_serial = t2.device_code
- AND t2.device_type = 7
- LEFT JOIN pole t3 ON t3.id = t2.pole_id
- </if>
+ LEFT JOIN pole_binding t2 ON t1.device_serial = t2.device_code
+ AND t2.device_type = 7
+ LEFT JOIN pole t3 ON t3.id = t2.pole_id
<where>
- <if test="keyword != null and keyword != ''">
- AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
+ <if test="userid != null">
+ AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
</if>
- <if test="clientId != null">
- AND t3.client_id = #{clientId}
+ <if test="keyword != null and keyword != ''">
+ AND ( t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
+ OR t1.device_serial LIKE CONCAT(CONCAT('%', #{keyword}), '%')
+ OR t1.note LIKE CONCAT(CONCAT('%', #{keyword}), '%')
+ OR t3.pole_code LIKE CONCAT(CONCAT('%', #{keyword}), '%'))
</if>
<if test="bindingState != 2">
AND t1.binding_state = #{bindingState}
</if>
</where>
- GROUP BY
- t1.device_serial
</select>
-
- <select id="listMonitorByIds" resultType="com.sandu.ximon.dao.bo.MonitorBo">
- SELECT
- t1.*, t2.pole_id,
- t3.pole_name
- FROM
- monitor t1
- LEFT JOIN pole_binding t2 ON t1.device_serial = t2.device_code
- AND t2.device_type = 7
- LEFT JOIN pole t3 ON t3.id = t2.pole_id
- <where>
- t1.id IN
- <foreach collection="airEquipmentIdList" open="(" close=")" item="airId" separator=",">
- #{airId}
- </foreach>
- </where>
- </select>
-
</mapper>
--
Gitblit v1.9.3