查询

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnvDataMapper.java

@@ -33,4 +33,6 @@ public interface EnvDataMapper extends BaseMapper<EnvData> {
     List<EnvDataScreenVo> getLastFlowScreen(String farmId);
 
     List<EnvDataGetOneVo> getOneData(String farmId);
+
+    List<EnvData> listDetail(String farmId, String unitId);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvDataServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -73,7 +74,12 @@ public class EnvDataServiceImpl extends ServiceImpl<EnvDataMapper, EnvData> impl
 
         //今日查询
         if ("1".equals(type)){
-            envDataList = envDataMapper.listDayDetail(farmId,unitId);
+            if (unitId.equals("95")){
+                envDataList = envDataMapper.listDetail(farmId,unitId);
+                Collections.reverse(envDataList);
+            }else {
+                envDataList = envDataMapper.listDayDetail(farmId,unitId);
+            }
         }
         //本周查询
         if ("2".equals(type)){

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

@@ -91,4 +91,12 @@ FROM
 	( SELECT create_time, max( id ) id,device_id FROM env_data GROUP BY device_id  ) a
 	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
+        FROM `env_data`
+        WHERE unit_id = #{unitId}
+        AND farm_id = #{farmId}
+        ORDER BY create_time DESC
+        LIMIT 50;
+    </select>
 </mapper>