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

jinpengyong

2023-09-05 ba9c4bca1bdf36f827ab258222d92c885ff890db

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

@@ -2,27 +2,17 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.api.mapper.HistoryHourlyMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.moral.api.entity.HistoryHourly">
        <result column="mac" property="mac"/>
        <result column="time" property="time"/>
        <result column="value" property="value"/>
        <result column="version" property="version"/>
    </resultMap>

    <insert id="insertHistoryHourlyUnAdjust">
        INSERT INTO history_hourly_${timeUnits} VALUES (#{mac}, #{time}, #{value}, #{version})
    <insert id="insertHistoryHourly">
        INSERT INTO history_hourly_${timeUnits}
        VALUES (#{mac}, #{time}, #{value}, #{version})
    </insert>

    <select id="getCountByMacAndTime" resultType="java.lang.Integer">
        SELECT count(1) FROM history_hourly_transition WHERE mac = #{mac} AND `time` = #{time}

    <select id="selectHistoryHourly" resultType="java.util.Map">
        SELECT `value`
        FROM history_hourly_${timeUnits}
        WHERE `time` = #{time}
          and mac = #{mac}
    </select>

    <insert id="insertHistoryHourlyTransition">
        INSERT INTO history_hourly_transition (mac, `time`, `value`, version) VALUES (#{mac}, #{time}, #{value}, #{version})
    </insert>

    <update id="updateHistoryTransition">
        UPDATE history_hourly_transition SET update_time = now() WHERE mac = #{mac} AND `time` = {time}
    </update>
</mapper>