Merge remote-tracking branch 'origin/master'

fengxiang

2018-09-20 a31c81dada74c63ff96c7adf7f21451f1e3ad989

Merge remote-tracking branch 'origin/master'

 src/main/resources/mapper/HistoryMapper.xml

@@ -143,7 +143,7 @@
    <select id="getActualDataByRegion" resultType="java.util.Map">

        SELECT

        <foreach collection="sensorKeys" separator="," item="sensorKey">

            MAX( CONVERT ( `value` -> '$.${sensorKey}', DECIMAL ) ) AS '${sensorKey}' 
            MAX( `value` ->> '$.${sensorKey}' ) * 1 AS '${sensorKey}' 
        </foreach>

        FROM

            history h ,