Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

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

@@ -128,4 +128,35 @@

        order by time desc
    </select>

    <select id="listAvgResult" resultType="com.moral.api.pojo.vo.historyMonthly.HistoryResultVo">
        select  DATE_FORMAT(time,'%Y-%m-%d %H') time,${type}
        FROM history_hourly${table} WHERE 1 =1 and
        time <![CDATA[>=]]> #{startTime}
        and time <![CDATA[<=]]> #{endTime}
        and mac in
        <foreach collection="macs" item="id" index="index" open="(" close=")" separator=",">
            #{id}
        </foreach>
        group by time
        order by time
    </select>

    <select id="HistoryMinutelyQuery" resultType="com.moral.api.entity.HistoryMinutely">
        SELECT mac,time,value,version FROM history_minutely${table}
        WHERE 1 =1
        <if test="macs != null and macs.size!=0">
            and mac in
            <foreach collection="macs" item="id" index="index" open="(" close=")" separator=",">
                #{id}
            </foreach>
        </if>
        <if test="mac != null and mac != ''">
            and mac = #{mac}
        </if>

        and time BETWEEN #{startDate} and #{endDate}

        order by time desc
    </select>
</mapper>