From 2e0bf4423c235802791012e1fb0817d2c9156b2a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 30 Aug 2023 09:28:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java
index e8feb8d..ac90e66 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java
@@ -5,6 +5,7 @@
import com.moral.api.entity.HistorySecondCruiser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserListDTO;
/**
* <p>
@@ -16,6 +17,18 @@
*/
public interface HistorySecondCruiserMapper extends BaseMapper<HistorySecondCruiser> {
+ List<Map<String,Object>> getCruiserData(Map<String,Object> params);
+
+ List<HistorySecondCruiserListDTO> getCruiserDataNewAvg(Map<String,Object> params);
+
List<String> getDates(Map<String,Object> params);
+
+ String getDaily(Map<String,Object> params);
+
+ List<Double> getDust(String start,String end,String mac);
+
+
+ List<Map<String,Object>> getAllCruiserData(Map<String,Object> params);
+
}
--
Gitblit v1.8.0