饼图 功能

xufenglei

2018-04-18 b52c1e137107abbaee8cdea45964def25c952a7f

 src/main/resources/mapper/HistoryMinutelyMapper.xml

@@ -7,7 +7,9 @@
   </resultMap>

   <select id="getSersionAvgByDevice" resultType="java.util.Map">

      SELECT

         ${sensorKeyColumn}

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

            AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'

         </foreach>

      FROM

         history_minutely

      WHERE

@@ -18,8 +20,10 @@
   

   <select id="getMonitorPointOrDeviceAvgData" resultType="java.util.Map">

      SELECT

         DATE_FORMAT(time, #{typeFormat}) time,

         ${sensorKeyColumn}

         DATE_FORMAT(time, #{typeFormat}) time

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

            AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'

         </foreach>

      FROM

         history_minutely h

      WHERE

@@ -30,10 +34,26 @@
      </if>

      <if test="mac == null">

      AND   h.mac IN

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

            #{listItem}

         </foreach>

		
         (SELECT

            d.mac 
         FROM

            device d,

            monitor_point mp 
         WHERE

            d.monitor_point_id = mp.id 
            <if test="provinceCode != null">

            AND mp.province_code = #{provinceCode}

            </if>

            <if test="cityCode != null">

            AND mp.city_code = #{cityCode}

            </if>

            <if test="areaCode != null">

            AND mp.area_code = #{areaCode}

            </if>

            <if test="monitorPointId != null">

            AND mp.id =   #{monitorPointId}

            </if>

         )	
      </if>

      

      GROUP BY

@@ -41,17 +61,22 @@
      ORDER BY

         time

   </select>

   <select id="selectLineChartDateByCrieria" resultMap="PairDataResultMap">

   <select id="selectLineChartDateByCrieria" resultType="java.util.Map">

         SELECT

            <choose>

               <when test="'MINUTE'==dataCondition.timeUnits.toString() and 'DEVICE'==dataCondition.areaRange.toString()">

                  json->'$.${sensorKey}[0]'

                  <foreach collection="sensorKeys"

                         item="sensorKey" separator="," close=",">

                          json->'$.${sensorKey}[0]' as '${sensorKey}'

                  </foreach>

               </when>

               <otherwise>

                  AVG(json->'$.${sensorKey}[0]')

                  <foreach collection="sensorKeys"

                         item="sensorKey" separator="," close=",">

                     AVG(json->'$.${sensorKey}[0]') as '${sensorKey}'

                  </foreach>

               </otherwise>

            </choose>

            as value,

           DATE_FORMAT(time,'${@com.moral.common.util.ReportTimeFormat@toMySqlTimeFormat(timePeriod.timeUnits)}') as format_time

           FROM

         `history_minutely` hmi