From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/resources/mapper/AirDataNongGengMapper.xml | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/dao/src/main/resources/mapper/AirDataNongGengMapper.xml b/dao/src/main/resources/mapper/AirDataNongGengMapper.xml
index b6d1dc9..d74ab4a 100644
--- a/dao/src/main/resources/mapper/AirDataNongGengMapper.xml
+++ b/dao/src/main/resources/mapper/AirDataNongGengMapper.xml
@@ -5,25 +5,29 @@
<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="DECIMAL"/>
- <result property="hydrogenSulfide" column="hydrogen_sulfide" jdbcType="DECIMAL"/>
- <result property="so2" column="so2" jdbcType="DECIMAL"/>
- <result property="no2" column="no2" jdbcType="DECIMAL"/>
- <result property="co" column="co" jdbcType="DECIMAL"/>
- <result property="o3" column="o3" jdbcType="DECIMAL"/>
- <result property="pm2point5" column="pm2point5" jdbcType="DECIMAL"/>
- <result property="pm10" column="pm10" jdbcType="DECIMAL"/>
- <result property="airTemperature" column="air_temperature" jdbcType="DECIMAL"/>
- <result property="airHumidity" column="air_humidity" jdbcType="DECIMAL"/>
- <result property="airPressure" column="air_pressure" jdbcType="DECIMAL"/>
- <result property="windDirection" column="wind_direction" jdbcType="DECIMAL"/>
- <result property="windSpeed" column="wind_speed" jdbcType="DECIMAL"/>
- <result property="tenRainfallMin" column="ten_rainfall_min" jdbcType="DECIMAL"/>
- <result property="radiation" column="radiation" jdbcType="DECIMAL"/>
- <result property="illumination" column="illumination" jdbcType="DECIMAL"/>
- <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">
@@ -33,7 +37,8 @@
pm10,air_temperature,air_humidity,
air_pressure,wind_direction,wind_speed,
ten_rainfall_min,radiation,illumination,
- create_time
+ ultraviolet,co2,o2,
+ type,create_time
</sql>
<select id="listAirId" resultType="java.lang.Long">
SELECT
--
Gitblit v1.9.3