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

cjl

2023-10-20 c7dd4a195d8d893d92c49963447cdf6486844584

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

@@ -50,11 +50,32 @@
          AND `time` <![CDATA[<=]]> #{time2}
    </select>

    <select id="getDust" resultType="java.lang.Double">
        select JSON_EXTRACT(value,'$.dustld')
    <select id="getDust" resultType="java.lang.String">
        select value ->>'$.dustld'
        from `history_second_cruiser`
        WHERE mac = #{mac}
          AND `time` <![CDATA[>=]]> #{start}
          AND `time` <![CDATA[<=]]> #{end}
    </select>


    <select id="getAllCruiserData" resultType="java.util.Map">
        SELECT
        `value`
        FROM `history_second_cruiser`
        WHERE mac = #{mac}
        AND `time` <![CDATA[>=]]> #{time1}
        AND `time` <![CDATA[<=]]> #{time2}
    </select>


    <select id="getDusts" resultType="java.util.Map">
        SELECT
            value ->>'$.flylat' as flyLat,value ->>'$.flylon' as flyLon,value ->>'$.dustld' as dustld,
            `time`
        FROM `history_second_cruiser`
        WHERE mac = #{mac}
          AND `time` <![CDATA[>=]]> #{startTime}
          AND `time` <![CDATA[<=]]> #{endTime}
    </select>
</mapper>