Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

 src/main/resources/mapper/DeviceMapper.xml

@@ -122,4 +122,23 @@
      ORDER BY
         s.id
   </select>
   <select id="getDeviceVersionIdByMonitorPoint" resultType="map">
      SELECT
      device_version_id deviceVersionId
      FROM
      device
      WHERE
      monitor_point_id = #{monitorPoint}
      GROUP BY
      device_version_id
   </select>
   <select id="getDeviceMacByMonitorPointAndDeviceVersion" resultType="string">
      SELECT
      mac
      FROM
      device
      WHERE
      monitor_point_id = #{monitorPointId}
      AND device_version_id = #{deviceVersionId}
   </select>
</mapper>