Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

 src/main/resources/mapper/HistoryMinutelyMapper.xml

@@ -213,33 +213,4 @@
        order by rs.monitorPointName

    </select>



    <select id="getDevicesSensorsAvgDataToExcel" resultType="java.util.LinkedHashMap">

        select

        rs.monitorPointName,rs.name,

        <foreach collection="timeList" separator="," item="time">

            max(case time when #{time} then rs.json else "" end) as #{time}

        </foreach>

        from

        (SELECT

        m.name as monitorPointName,d.name,DATE_FORMAT(time, #{typeFormat}) time,h.json

        FROM

        history_${timeUnits} h,

        device d,

        monitor_point m

        WHERE

        h.mac=d.mac

        AND d.monitor_point_id=m.id

        AND h.time >= #{start}

        AND h.time <![CDATA[<=]]> #{end}

        AND h.mac in

        <foreach collection="macs" open="(" separator="," close=")"

                 item="mac">

            #{mac}

        </foreach>

        ORDER BY

        h.mac) rs

        GROUP BY rs.monitorPointName,rs.name

        order by rs.monitorPointName

    </select>



</mapper>