moral.git - Gitblit

summary
reflog
commits
tree
tickets
docs
forks
compare

Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-09-01 979166aaa979629bf223a44a46aeb6d0c0e61aec

 screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml

@@ -15,6 +15,7 @@
        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>

			@@ -15,6 +15,7 @@
			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>