检测设备实时数据查询

huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/EcoDeviceFlowController.java

@@ -33,5 +33,6 @@ public class EcoDeviceFlowController {
         return ecoDeviceFlowService.getLastFlow(request);
     }
 
+
 }
 

huimv-farm-environ/src/main/java/com/huimv/environ/eco/entity/dto/LastFlowDto.java

@@ -7,5 +7,4 @@ public class LastFlowDto {
     private String tem;
     private String hum;
     private String room;
-
 }

huimv-farm-environ/src/main/resources/com/huimv/environ/eco/mapper/EcoDeviceFlowMapper.xml

@@ -26,11 +26,11 @@
 
 
     <select id="getLastFlow" resultType="com.huimv.environ.eco.entity.dto.LastFlowDto">
-       SELECT CONCAT(b.pigpen_name,a.pigpen_name) room,d.device_code,df.id1_value 'tem',df.id2_value 'hum'
-        FROM `base_pigpen` a INNER JOIN `base_pigpen` b ON a.parent_id =b.id
-        LEFT JOIN `eco_device` d ON d.unit_id = a.id
+       SELECT CONCAT(b.pigpen_name,a.pigpen_name) room,df.id1_value 'tem',df.id2_value 'hum'
+        FROM `base_pigpen` a INNER JOIN `base_pigpen` b ON a.parent_id =b.id AND a.farm_code = #{farmId}
+        LEFT JOIN `eco_device` d ON d.unit_id = a.id AND d.device_type ='1'
         LEFT JOIN `eco_device_flow` df ON d.device_code = df.device_code
-        AND df.id IN (SELECT MAX(df.id) FROM `eco_device_flow` df GROUP BY device_code) AND df.farm_id=#{farmId}
+        AND df.id IN (SELECT MAX(df.id) FROM `eco_device_flow` df GROUP BY device_code)
         ORDER BY a.id DESC,a.parent_id DESC
     </select>
 </mapper>