~chenjialiang/moral.git

陈家良 / moral

forked from moral

summary
commits
tree
docs
forks
compare

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

cjl

2023-08-11 eb6d41359a8957c6355275f7697db202d6a523db

 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>