Explorar el Código

栋舍温湿度逻辑

Newspaper hace 2 años
padre
commit
6dd3cf6fb5

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

@@ -19,14 +19,18 @@
     </resultMap>
 
     <select id="getLastFlow" resultType="com.huimv.guowei.admin.entity.vo.EnvDataVo">
-        SELECT b.id,b.build_name,d.env_temp,d.env_hum FROM `env_data` d LEFT JOIN `base_building`  b
-    ON b.id = d.unit_id
-    WHERE d.id IN (
-        SELECT MAX(id)
-        FROM `env_data`
-        GROUP BY unit_id
-    )AND d.farm_id = #{farmId}
-    ORDER BY b.id ASC
+        SELECT d.env_temp, d.env_hum, b.id, b.build_name
+        FROM base_building b
+        LEFT OUTER JOIN (
+            SELECT unit_id, env_temp, env_hum, create_time
+            FROM env_data
+            WHERE (unit_id, create_time) IN (
+                SELECT unit_id, MAX(create_time)
+                FROM env_data
+                 GROUP BY unit_id
+            )
+        ) d ON b.id = d.unit_id
+        WHERE b.parent_id = 0 AND b.farm_id = #{farmId}
     </select>
 
     <select id="listDayDetail" resultType="com.huimv.guowei.admin.entity.EnvData">
@@ -66,13 +70,17 @@
     </select>
 
     <select id="getLastFlowScreen" resultType="com.huimv.guowei.admin.entity.vo.EnvDataScreenVo">
-        SELECT b.id,b.build_name,d.env_temp,d.env_hum FROM `env_data` d LEFT JOIN `base_building`  b
-    ON b.id = d.unit_id
-    WHERE d.id IN (
-        SELECT MAX(id)
-        FROM `env_data`
-        GROUP BY unit_id
-    )AND d.farm_id = #{farmId}
-    ORDER BY b.id ASC
+        SELECT d.env_temp, d.env_hum, b.id, b.build_name
+        FROM base_building b
+        LEFT OUTER JOIN (
+            SELECT unit_id, env_temp, env_hum, create_time
+            FROM env_data
+            WHERE (unit_id, create_time) IN (
+                SELECT unit_id, MAX(create_time)
+                FROM env_data
+                 GROUP BY unit_id
+            )
+        ) d ON b.id = d.unit_id
+        WHERE b.parent_id = 0 AND b.farm_id = #{farmId}
     </select>
 </mapper>