From 2c743103cfa6e24bcb3fd064845c8cfd8fe8bbe6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 14:02:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml | 5 +++--
1 files changed, 3 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..ce67a21 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
@@ -12,9 +12,10 @@
</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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0