From 0e0643aed8857e9b845ee5dcc56cdec652bc89f2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 28 Aug 2023 15:59:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index 2f52e18..441d95e 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
@@ -57,4 +57,14 @@
           AND `time` <![CDATA[>=]]> #{start}
           AND `time` <![CDATA[<=]]> #{end}
     </select>
+
+
+    <select id="getAllCruiserData" resultType="java.util.Map">
+        SELECT
+        `value`
+        FROM `history_second_cruiser`
+        WHERE mac = #{mac}
+        AND `time` <![CDATA[>=]]> #{time1}
+        AND `time` <![CDATA[<=]]> #{time2}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0