From bd8b3f8e4b5d8af99f267eb5c6efaac03406c620 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 20:03:01 +0800
Subject: [PATCH] Merge branch 'wb' into qa

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

diff --git a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
index c237c8e..ce67a21 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
@@ -11,4 +11,11 @@
                     <result column="batch" property="batch" />
         </resultMap>
 
+    <select id="reList" resultType="com.moral.api.entity.HistorySecondUav">
+        SELECT history_second_uav.time,`value`
+        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