From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

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

diff --git a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
index ce67a21..7f36d45 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
@@ -18,4 +18,12 @@
         HAVING abs(`value`->>'$.flyhig') <![CDATA[>=]]> #{height1}
         and  abs(`value`->>'$.flyhig') <![CDATA[<=]]> #{height2}
     </select>
+
+    <select id="reListDetail" resultType="com.moral.api.pojo.dto.uav.UAVGetBD">
+        SELECT history_second_uav.time,value->>#{type} as num,value->>'$.flylon' as flyLon,value->>'$.flylat' as flyLat
+        FROM history_second_uav WHERE mac = #{mac}
+                                  AND batch = #{batch}
+        HAVING abs(`value`->>'$.flyhig') <![CDATA[>=]]> #{height1}
+           and  abs(`value`->>'$.flyhig') <![CDATA[<=]]> #{height2}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0