From 8490eb11583ffdc586436f165860de5cfc39f915 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:18:29 +0800
Subject: [PATCH] fix:sql查询时间调整

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

diff --git a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
index 8756866..7f36d45 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
@@ -12,9 +12,18 @@
         </resultMap>
 
     <select id="reList" resultType="com.moral.api.entity.HistorySecondUav">
-        SELECT `value`
+        SELECT history_second_uav.time,`value`
         FROM history_second_uav WHERE mac = #{mac}
         AND batch = #{batch}
-        HAVING abs(`value`->>'$.flyhig') <![CDATA[>=]]> #{height}
+        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