From 44251a92dc85a93eff59704b40b07830bde8d16f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 27 Jul 2023 15:38:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

---
 screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml |    6 ++++++
 1 files changed, 6 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..8756866 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
@@ -11,4 +11,10 @@
                     <result column="batch" property="batch" />
         </resultMap>
 
+    <select id="reList" resultType="com.moral.api.entity.HistorySecondUav">
+        SELECT `value`
+        FROM history_second_uav WHERE mac = #{mac}
+        AND batch = #{batch}
+        HAVING abs(`value`->>'$.flyhig') <![CDATA[>=]]> #{height}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0