本地诺瓦调整

Van333

2022-12-15 5e94332935da62448c17f89a807acf46a5ae3e75

 dao/src/main/resources/mapper/AirDataMapper.xml

@@ -5,37 +5,33 @@
<mapper namespace="com.sandu.ximon.dao.mapper.AirDataMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirData">
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="deviceMac" column="device_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="DOUBLE"/>
        <result property="humidity" column="humidity" jdbcType="DOUBLE"/>
        <result property="windSpeed" column="wind_speed" jdbcType="DOUBLE"/>
        <result property="windDirection" column="wind_direction" jdbcType="DOUBLE"/>
        <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="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"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="deviceMac" column="device_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="VARCHAR"/>
            <result property="humidity" column="humidity" jdbcType="VARCHAR"/>
            <result property="windSpeed" column="wind_speed" jdbcType="VARCHAR"/>
            <result property="windDirection" column="wind_direction" jdbcType="VARCHAR"/>
            <result property="windPower" column="wind_power" jdbcType="VARCHAR"/>
            <result property="pressure" column="pressure" jdbcType="VARCHAR"/>
            <result property="lightIntensity" column="light_intensity" jdbcType="VARCHAR"/>
            <result property="noise" column="noise" jdbcType="VARCHAR"/>
            <result property="pm25" column="pm25" jdbcType="VARCHAR"/>
            <result property="pm10" column="pm10" jdbcType="VARCHAR"/>
            <result property="tsp" column="tsp" jdbcType="VARCHAR"/>
            <result property="rain" column="rain" jdbcType="VARCHAR"/>
            <result property="ech2o" column="ech2o" jdbcType="VARCHAR"/>
            <result property="tvoc" column="tvoc" jdbcType="VARCHAR"/>
            <result property="co2" column="co2" jdbcType="VARCHAR"/>
            <result property="so2" column="so2" jdbcType="VARCHAR"/>
            <result property="no2" column="no2" jdbcType="VARCHAR"/>
            <result property="co" column="co" jdbcType="VARCHAR"/>
            <result property="o3" column="o3" jdbcType="VARCHAR"/>
            <result property="fluoride" column="fluoride" jdbcType="VARCHAR"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <select id="listAirEquipmentMAC" resultType="java.lang.String">
        SELECT DISTINCT device_mac
        FROM air_data
    </select>


    <select id="listAirId" resultType="java.lang.Long">
        SELECT
@@ -49,7 +45,8 @@
        </if>
        <where>
            <if test="keyword != null and keyword != ''">
                AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
                AND (t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
                OR t1.device_mac  LIKE CONCAT(CONCAT('%', #{keyword}), '%'))
            </if>
            <if test="userid != null">
                AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
@@ -79,11 +76,23 @@
        select t1.device_code
        from pole_binding t1
        left join pole t2 on t1.pole_id = t2.id
        where t1.device_type = 3
        where t1.device_type = 11
        and t1.pole_id = #{poleId}
        <if test="clientId != null">
            AND (t2.user_id = #{clientId} OR t2.client_id = #{clientId})
        </if>

    </select>
</mapper>
    <select id="listAirDataHistory" resultType="com.sandu.ximon.dao.bo.AirDataBo">
        SELECT
        t1.*, t2.pole_id,
        t3.pole_name
        FROM
        air_data t1
        LEFT JOIN pole_binding t2 ON t1.device_mac = t2.device_code
        AND t2.device_type = 3
        LEFT JOIN pole t3 ON t3.id = t2.pole_id
        WHERE  t1.device_mac = #{deviceMac}
        ORDER BY t1.create_time DESC
    </select>
</mapper>