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

cjl

2023-07-07 7029a780a1738bffdb6b00fa94d7b845f9444a5d

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

@@ -20,4 +20,41 @@
        ORDER BY `time`
    </select>

    <select id="getCruiserData" resultType="java.util.Map">
        SELECT
        DATE_FORMAT(`time`, #{dateFormat}) AS `time`,
        `value`
        FROM `history_second_cruiser`
        WHERE mac = #{mac}
        AND `time` <![CDATA[>=]]> #{time1}
        AND `time` <![CDATA[<=]]> #{time2}
        AND organization_id = #{orgId}
    </select>

    <select id="getCruiserDataNewAvg" resultType="com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserListDTO">
        select  DATE_FORMAT(`time`, #{dateFormat}) AS time,value ->>'$.flylat' as flyLat,value ->>'$.flylon' as flyLon ,
           value ->> #{type} as num
        from history_second_cruiser
        WHERE mac = #{mac}
          AND `time` <![CDATA[>=]]> #{time1}
          AND `time` <![CDATA[<=]]> #{time2}
          AND organization_id = #{orgId}
        order by time
    </select>

    <select id="getDaily" resultType="java.lang.String">
        select AVG(JSON_EXTRACT(value,'$.dustld'))
        from `history_second_cruiser`
        WHERE mac = #{mac}
          AND `time` <![CDATA[>=]]> #{time1}
          AND `time` <![CDATA[<=]]> #{time2}
    </select>

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