Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job

lizijie

2021-11-29 d8310f6bc609440fa352c0e5a9436c7c78caa287

 src/main/resources/mapper/HistoryHourlyMapper.xml

@@ -96,4 +96,18 @@
        group by h.time
    </select>

    <select id="selectCountByMac" resultType="java.lang.Integer">
        SELECT count(1) FROM history_hourly
        WHERE mac = #{mac}
        AND `time` >= #{start}
        AND `time` <![CDATA[<]]> #{end}
    </select>

    <select id="selectDataByMac" resultType="java.lang.String">
        select
        json
        from history_hourly
        where mac = #{mac}
        and `time` = #{time}
    </select>
</mapper>