~chenjialiang/moral.git

陈家良 / moral

forked from moral

summary
commits
tree
docs
forks
compare

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

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

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

@@ -11,4 +11,11 @@
                    <result column="batch" property="batch" />
        </resultMap>

    <select id="reList" resultType="com.moral.api.entity.HistorySecondUav">
        SELECT history_second_uav.time,`value`
        FROM history_second_uav WHERE mac = #{mac}
        AND batch = #{batch}
        HAVING abs(`value`->>'$.flyhig') <![CDATA[>=]]> #{height1}
        and  abs(`value`->>'$.flyhig') <![CDATA[<=]]> #{height2}
    </select>
</mapper>

			@@ -11,4 +11,11 @@
			<result column="batch" property="batch" />
			</resultMap>

			<select id="reList" resultType="com.moral.api.entity.HistorySecondUav">
			SELECT history_second_uav.time,`value`
			FROM history_second_uav WHERE mac = #{mac}
			AND batch = #{batch}
			HAVING abs(`value`->>'$.flyhig') <![CDATA[>=]]> #{height1}
			and abs(`value`->>'$.flyhig') <![CDATA[<=]]> #{height2}
			</select>
			</mapper>