From dbcb7d4d6189f4d0d72e2481ba711b328d4e54a9 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 12 Aug 2023 14:20:22 +0800
Subject: [PATCH] fix:小时数据问题修复

---
 screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
index 17ca271..92324ce 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.moral.api.entity.HistoryHourly;
+import com.moral.api.pojo.dto.Wind.WindData;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -19,9 +21,23 @@
 
     String selectHourlyData(Map<String,Object> params);
 
+    List<Map<String,Object>> selectHourlyListData(Map<String,Object> params);
+
     List<Map<String,Object>> selectDataByMacsAndTime(@Param("timeUnits") String timeUnits, @Param("list")List list, @Param("time")String time);
 
-    Double getSensorSumByMacs(@Param("sensorCode") String sensorCode, @Param("macs") List<String> macs, @Param("time") String time, @Param("timeUnits") String timeUnits);
 
-    Double getSensorAvgByMacs(@Param("sensorCode") String sensorCode, @Param("macs") List<String> macs, @Param("time") String time, @Param("timeUnits") String timeUnits);
+    String queryLastHourlyMac(String mac,String time,String timeUnits);
+
+
+    List<WindData> getArea(Map<String, Object> params);
+
+//    //������TVOC������
+//    String getTVOCByMac(@Param("mac") String mac, @Param("time") String time, @Param("sensor") String sensor,@Param("yearAndMonth") String yearAndMonth);
+//
+//    //������������������
+//    String getPressureByMac(@Param("mac") String mac,@Param("time") String time,@Param("yearAndMonth") String yearAndMonth);
+//
+//
+//    Map<String,Object> getDataByMac(@Param("mac") String mac,@Param("time") String time,@Param("yearAndMonth") String yearAndMonth);
+    void insertHistoryHourly(Map<String, Object> params);
 }

--
Gitblit v1.8.0