From 161ec503806c8b71f5caa2d42c2fa9c03ca062d6 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 28 二月 2022 15:17:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/resources/mapper/MonitorMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/dao/src/main/resources/mapper/MonitorMapper.xml b/dao/src/main/resources/mapper/MonitorMapper.xml
index 1838635..6a7365d 100644
--- a/dao/src/main/resources/mapper/MonitorMapper.xml
+++ b/dao/src/main/resources/mapper/MonitorMapper.xml
@@ -49,7 +49,7 @@
<select id="listMonitorByIds" resultType="com.sandu.ximon.dao.bo.MonitorBo">
SELECT
t1.*, t2.pole_id,
- t3.pole_name
+ t3.pole_name, t3.province,t3.city,t3.region,t3.address
FROM
monitor t1
LEFT JOIN pole_binding t2 ON t1.device_serial = t2.device_code
@@ -68,7 +68,13 @@
<if test="bindingState != 2">
AND t1.binding_state = #{bindingState}
</if>
+ <if test="equipmentState != 2">
+ AND t1.equipment_state = #{equipmentState}
+ </if>
</where>
</select>
+ <select id="listMonitorDeviceSerial" resultType="java.lang.String">
+ SELECT device_serial FROM monitor;
+ </select>
</mapper>
--
Gitblit v1.9.3