From a1ef8a466a6603fe37cb6f7341ce127ab0861c07 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 23 Oct 2023 12:58:33 +0800
Subject: [PATCH] chore:测试提交

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

diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index 2f52e18..1b61bbb 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
@@ -50,11 +50,32 @@
           AND `time` <![CDATA[<=]]> #{time2}
     </select>
 
-    <select id="getDust" resultType="java.lang.Double">
-        select JSON_EXTRACT(value,'$.dustld')
+    <select id="getDust" resultType="java.lang.String">
+        select value ->>'$.dustld'
         from `history_second_cruiser`
         WHERE mac = #{mac}
           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>
+
+
+    <select id="getDusts" resultType="java.util.Map">
+        SELECT
+            value ->>'$.flylat' as flyLat,value ->>'$.flylon' as flyLon,value ->>'$.dustld' as dustld,
+            `time`
+        FROM `history_second_cruiser`
+        WHERE mac = #{mac}
+          AND `time` <![CDATA[>=]]> #{startTime}
+          AND `time` <![CDATA[<=]]> #{endTime}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0