From f72da3bc5ca43fd37c1f0de15a1e9128a627a563 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 18 Apr 2024 13:59:35 +0800
Subject: [PATCH] fix:日报数据调整

---
 screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java |   37 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 36 insertions(+), 1 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 819edd9..b4295db 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
@@ -1,5 +1,13 @@
 package com.moral.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.moral.api.entity.HistoryHourly;
+import com.moral.api.entity.HistoryMinutely;
+import com.moral.api.pojo.dto.Wind.WindData;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -10,8 +18,35 @@
  * @author moral
  * @since 2021-07-14
  */
-public interface HistoryHourlyMapper{
+public interface HistoryHourlyMapper extends BaseMapper<HistoryHourly> {
 
     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);
+
+
+    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);
+
+    void updateHistoryHourly(Map<String, Object> params);
+
+    List<HistoryHourly> listResult(Map<String, Object> params);
+
+    List<HistoryHourly> listLikeResult(Map<String, Object> params);
+
+    List<HistoryMinutely> HistoryMinutelyQuery(Map<String, Object> params);
 }

--
Gitblit v1.8.0