From 7a00187d197548e23a38dcb87187ef6b2b7f8bfb Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 24 十月 2022 11:19:58 +0800
Subject: [PATCH] changes
---
dao/src/main/resources/mapper/AirEquipmentMapper.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/dao/src/main/resources/mapper/AirEquipmentMapper.xml b/dao/src/main/resources/mapper/AirEquipmentMapper.xml
index 3d5c182..f403b64 100644
--- a/dao/src/main/resources/mapper/AirEquipmentMapper.xml
+++ b/dao/src/main/resources/mapper/AirEquipmentMapper.xml
@@ -5,11 +5,54 @@
<mapper namespace="com.sandu.ximon.dao.mapper.AirEquipmentMapper">
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirEquipment">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="belongTo" column="belong_to" jdbcType="VARCHAR"/>
- <result property="equipmentState" column="equipment_state" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="userId" column="user_id" jdbcType="BIGINT"/>
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="mac" column="mac" jdbcType="VARCHAR"/>
+ <result property="airMac" column="air_mac" jdbcType="VARCHAR"/>
+ <result property="deviceType" column="device_type" jdbcType="VARCHAR"/>
+ <result property="moduleWarmUpStatusFlag" column="module_warm_up_status_flag" jdbcType="VARCHAR"/>
+ <result property="temperature" column="temperature" jdbcType="INTEGER"/>
+ <result property="humidity" column="humidity" jdbcType="INTEGER"/>
+ <result property="windSpeed" column="wind_speed" jdbcType="INTEGER"/>
+ <result property="windDirection" column="wind_direction" jdbcType="INTEGER"/>
+ <result property="windPower" column="wind_power" jdbcType="INTEGER"/>
+ <result property="pressure" column="pressure" jdbcType="INTEGER"/>
+ <result property="lightIntensity" column="light_intensity" jdbcType="INTEGER"/>
+ <result property="noise" column="noise" jdbcType="INTEGER"/>
+ <result property="pm25" column="pm25" jdbcType="INTEGER"/>
+ <result property="pm10" column="PM10" jdbcType="INTEGER"/>
+ <result property="tsp" column="tsp" jdbcType="INTEGER"/>
+ <result property="rain" column="rain" jdbcType="INTEGER"/>
+ <result property="so2" column="so2" jdbcType="INTEGER"/>
+ <result property="ech2o" column="ech2o" jdbcType="INTEGER"/>
+ <result property="no2" column="no2" jdbcType="INTEGER"/>
+ <result property="tvoc" column="tvoc" jdbcType="INTEGER"/>
+ <result property="co" column="co" jdbcType="INTEGER"/>
+ <result property="co2" column="co2" jdbcType="INTEGER"/>
+ <result property="o3" column="o3" jdbcType="INTEGER"/>
+ <result property="fluoride" column="fluoride" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
</resultMap>
-</mapper>
\ No newline at end of file
+ <select id="listAirEquipmentByIds" resultType="com.sandu.ximon.dao.bo.AirEquipmentBo">
+ SELECT
+ t1.*, t2.pole_id,
+ t3.pole_name
+ FROM
+ air_equipment t1
+ LEFT JOIN pole_binding t2 ON t1.mac = t2.device_code
+ AND t2.device_type = 3
+ 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}), '%')
+ or t1.mac 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