From 010f4ba252db180fc7fea4d7cb1b84a0bca7479f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 11 Aug 2023 16:37:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java |    6 ++++++
 1 files changed, 6 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 15261bc..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>
@@ -18,6 +19,8 @@
 
     List<Map<String,Object>> getCruiserData(Map<String,Object> params);
 
+    List<HistorySecondCruiserListDTO> getCruiserDataNewAvg(Map<String,Object> params);
+
     List<String> getDates(Map<String,Object> params);
 
 
@@ -25,4 +28,7 @@
 
     List<Double> getDust(String start,String end,String mac);
 
+
+    List<Map<String,Object>> getAllCruiserData(Map<String,Object> params);
+
 }

--
Gitblit v1.8.0