changes

LHN

2022-10-19 8adb5f2dda515e44d05690400065c61669911139

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

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

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirDataNongGeng">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="mac" column="mac" jdbcType="VARCHAR"/>
            <result property="noise" column="noise" jdbcType="VARCHAR"/>
            <result property="hydrogenSulfide" column="hydrogen_sulfide" 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="pm2point5" column="pm2point5" jdbcType="VARCHAR"/>
            <result property="pm10" column="pm10" jdbcType="VARCHAR"/>
            <result property="airTemperature" column="air_temperature" jdbcType="VARCHAR"/>
            <result property="airHumidity" column="air_humidity" jdbcType="VARCHAR"/>
            <result property="airPressure" column="air_pressure" jdbcType="VARCHAR"/>
            <result property="windDirection" column="wind_direction" jdbcType="VARCHAR"/>
            <result property="windSpeed" column="wind_speed" jdbcType="VARCHAR"/>
            <result property="tenRainfallMin" column="ten_rainfall_min" jdbcType="VARCHAR"/>
            <result property="radiation" column="radiation" jdbcType="VARCHAR"/>
            <result property="illumination" column="illumination" jdbcType="VARCHAR"/>
            <result property="ultraviolet" column="ultraviolet" jdbcType="VARCHAR"/>
            <result property="co2" column="co2" jdbcType="VARCHAR"/>
            <result property="o2" column="o2" jdbcType="VARCHAR"/>
            <result property="type" column="type" jdbcType="VARCHAR"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="mac" column="mac" jdbcType="VARCHAR"/>
        <result property="noise" column="noise" jdbcType="VARCHAR"/>
        <result property="hydrogenSulfide" column="hydrogen_sulfide" 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="pm2point5" column="pm2point5" jdbcType="VARCHAR"/>
        <result property="pm10" column="pm10" jdbcType="VARCHAR"/>
        <result property="airTemperature" column="air_temperature" jdbcType="VARCHAR"/>
        <result property="airHumidity" column="air_humidity" jdbcType="VARCHAR"/>
        <result property="airPressure" column="air_pressure" jdbcType="VARCHAR"/>
        <result property="windDirection" column="wind_direction" jdbcType="VARCHAR"/>
        <result property="windSpeed" column="wind_speed" jdbcType="VARCHAR"/>
        <result property="tenRainfallMin" column="ten_rainfall_min" jdbcType="VARCHAR"/>
        <result property="radiation" column="radiation" jdbcType="VARCHAR"/>
        <result property="illumination" column="illumination" jdbcType="VARCHAR"/>
        <result property="ultraviolet" column="ultraviolet" jdbcType="VARCHAR"/>
        <result property="co2" column="co2" jdbcType="VARCHAR"/>
        <result property="o2" column="o2" jdbcType="VARCHAR"/>
        <result property="type" column="type" jdbcType="VARCHAR"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,mac,noise,
        id
        ,mac,noise,
        hydrogen_sulfide,so2,no2,
        co,o3,pm2point5,
        pm10,air_temperature,air_humidity,
@@ -51,6 +52,7 @@
            LEFT JOIN pole t3 ON t3.id = t2.pole_id
        </if>
        <where>
            1=1
            <if test="keyword != null and keyword != ''">
                AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
            </if>