From a14c387388ddeb00f730a4b2ad3c21dcf223ff20 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 25 四月 2022 15:55:22 +0800
Subject: [PATCH] 大气设备、数据(农耕)

---
 dao/src/main/resources/mapper/AirDataNongGengMapper.xml |   76 ++++++++++++++++++++++++++++---------
 1 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/dao/src/main/resources/mapper/AirDataNongGengMapper.xml b/dao/src/main/resources/mapper/AirDataNongGengMapper.xml
index e0616e9..b6d1dc9 100644
--- a/dao/src/main/resources/mapper/AirDataNongGengMapper.xml
+++ b/dao/src/main/resources/mapper/AirDataNongGengMapper.xml
@@ -5,25 +5,25 @@
 <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="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"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -35,4 +35,42 @@
         ten_rainfall_min,radiation,illumination,
         create_time
     </sql>
+    <select id="listAirId" resultType="java.lang.Long">
+        SELECT
+        MAX(t1.id) AS air_id
+        FROM
+        air_data_nong_geng t1
+        <if test="keyword != null and keyword != ''">
+            LEFT JOIN pole_binding t2 ON t1.mac = t2.device_code
+            AND t2.device_type = 11
+            LEFT JOIN pole t3 ON t3.id = t2.pole_id
+        </if>
+        <where>
+            <if test="keyword != null and keyword != ''">
+                AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
+            </if>
+            <if test="userid != null">
+                AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
+            </if>
+        </where>
+        GROUP BY
+        t1.mac
+    </select>
+    <select id="listAirDataByIds" resultType="com.sandu.ximon.dao.bo.AirDataNongGengBo">
+        SELECT
+        t1.*, t2.pole_id,
+        t3.pole_name
+        FROM
+        air_data_nong_geng t1
+        LEFT JOIN pole_binding t2 ON t1.mac = t2.device_code
+        AND t2.device_type = 11
+        LEFT JOIN pole t3 ON t3.id = t2.pole_id
+        <where>
+            t1.id IN
+            <foreach collection="airIdList" open="(" close=")" item="airId" separator=",">
+                #{airId}
+            </foreach>
+        </where>
+    </select>
+
 </mapper>

--
Gitblit v1.9.3