From 856f1cf8ee52443ce616ce00ecff7cbb7c30f000 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 01 Nov 2023 16:21:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 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 ec74607..19ce895 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,7 +1,13 @@
package com.moral.api.mapper;
-import com.moral.api.entity.HistoryHourly;
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;
+import java.util.Map;
/**
* <p>
@@ -13,4 +19,31 @@
*/
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);
}
--
Gitblit v1.8.0