From 3bbf11c99f594a2757f601fa3c680917cea33c17 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 27 Sep 2023 11:09:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
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