查询

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/EnvDataVo.java

@@ -8,4 +8,5 @@ public class EnvDataVo {
     private String buildName;
     private String envTemp;
     private String envHum;
+    private String other1;
 }

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvDataMapper.xml

@@ -19,10 +19,10 @@
     </resultMap>
 
     <select id="getLastFlow" resultType="com.huimv.guowei.admin.entity.vo.EnvDataVo">
-        SELECT DISTINCT d.env_temp, d.env_hum, b.id, b.build_name
+        SELECT DISTINCT d.env_temp, d.env_hum,d.other1, b.id, b.build_name
         FROM base_building b
         LEFT OUTER JOIN (
-            SELECT unit_id, env_temp, env_hum, create_time
+            SELECT unit_id, env_temp, env_hum,other1, create_time
             FROM env_data
             WHERE (unit_id, create_time) IN (
                 SELECT unit_id, MAX(create_time)
@@ -34,14 +34,14 @@
     </select>
 
     <select id="listDayDetail" resultType="com.huimv.guowei.admin.entity.EnvData">
-        SELECT ROUND(env_temp,2) 'envTemp',ROUND(env_hum,2) 'envHum',create_time FROM `env_data`
+        SELECT ROUND(env_temp,2) 'envTemp',ROUND(env_hum,2) 'envHum',ROUND(other1,2) 'other1'，create_time FROM `env_data`
         WHERE unit_id = #{unitId}
         AND farm_id = #{farmId}
         AND TO_DAYS(create_time) = TO_DAYS(NOW()) ORDER BY create_time ASC
     </select>
 
     <select id="listWeekDetail" resultType="com.huimv.guowei.admin.entity.EnvData">
-        SELECT ROUND(AVG(env_temp),2) 'envTemp',ROUND(AVG(env_hum),2) 'envHum',create_time FROM `env_data`
+        SELECT ROUND(AVG(env_temp),2) 'envTemp',ROUND(AVG(env_hum),2) 'envHum',ROUND(AVG(other1),2) 'other1',create_time FROM `env_data`
         WHERE unit_id = #{unitId}
         AND farm_id = #{farmId}
         AND create_time BETWEEN (SELECT DATE_SUB(CURDATE(),INTERVAL WEEKDAY(CURDATE()) DAY)) AND NOW()
@@ -49,7 +49,7 @@
     </select>
 
     <select id="listMonthDetail" resultType="com.huimv.guowei.admin.entity.EnvData">
-        SELECT ROUND(AVG(env_temp),2) 'envTemp',ROUND(AVG(env_hum),2) 'envHum',create_time FROM `env_data`
+        SELECT ROUND(AVG(env_temp),2) 'envTemp',ROUND(AVG(env_hum),2) 'envHum',ROUND(AVG(other1),2) 'other1',create_time FROM `env_data`
         WHERE unit_id = #{unitId}
         AND farm_id = #{farmId}
         AND create_time BETWEEN (SELECT DATE_ADD(CURDATE(),INTERVAL -DAY(CURDATE())+1 DAY)) AND NOW()
@@ -57,7 +57,7 @@
     </select>
 
     <select id="listCustomDetail" resultType="com.huimv.guowei.admin.entity.EnvData">
-        SELECT ROUND(AVG(env_temp),2) 'envTemp',ROUND(AVG(env_hum),2) 'envHum',create_time FROM `env_data`
+        SELECT ROUND(AVG(env_temp),2) 'envTemp',ROUND(AVG(env_hum),2) 'envHum',ROUND(AVG(other1),2) 'other1',create_time FROM `env_data`
         WHERE unit_id = #{unitId}
         AND farm_id = #{farmId}
         AND create_time BETWEEN '${startDate}' AND '${endDate}'
@@ -92,7 +92,7 @@ FROM
 	JOIN env_data b ON a.device_id = b.device_id AND a.id = b.id WHERE b.farm_id=#{farmId}
     </select>
     <select id="listDetail" resultType="com.huimv.guowei.admin.entity.EnvData">
-        SELECT ROUND(env_temp, 2) AS 'envTemp', ROUND(env_hum, 2) AS 'envHum', create_time
+        SELECT ROUND(env_temp, 2) AS 'envTemp', ROUND(env_hum, 2) AS 'envHum',ROUND(other1, 2) AS 'other1', create_time
         FROM `env_data`
         WHERE unit_id = #{unitId}
         AND farm_id = #{farmId}