Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-04 71af09a7d35a1146122776bebac8d51c1903beed

 src/main/resources/mapper/AlarmMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.moral.mapper.AlarmMapper">

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

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

      SELECT

         <if test="dimension=='monitorPoint'">

            `name`,

@@ -32,11 +32,11 @@
                     </foreach>

                  </when>

                  <otherwise>

                     DATE_FORMAT( h.time, '%Y-%m-%d' ) AS 'time'

                      h.time

                  </otherwise>

               </choose>

            FROM

               alarm h, 
               alarm_daily h, 
               device d,

               monitor_point mp 

            WHERE d.monitor_point_id = mp.id 

@@ -68,7 +68,7 @@
               <if test="dimension=='monitorPoint'">

                  mp.id,

               </if>

               DATE_FORMAT( h.time, '%Y-%m-%d' )

               h.time

         ) a

      <if test="dimension=='monitorPoint'">

         GROUP BY name