From a0a6f95ec5b92be03385eea83b64bf97fcbfa17e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 02 Nov 2023 17:08:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev

---
 screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java |   12 ++++++++++++
 1 files changed, 12 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 ab010b5..a725f09 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>
@@ -18,6 +19,17 @@
 
     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<String> getDust(String start,String end,String mac);
+
+    List<Map<String,Object>> getDusts(Map<String,Object> params);
+
+    List<Map<String,Object>> getAllCruiserData(Map<String,Object> params);
+
 }

--
Gitblit v1.8.0