Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/resources/mapper/SensorMapper.xml

@@ -137,6 +137,15 @@
      AND d.id = #{id}
   </select>

    <select id="getSensorByDId" resultType="java.util.Map">
      SELECT DISTINCT d.monitor_point_id,s.*
      FROM device d,device_version dv,device_version_sensor dvs,sensor s
      WHERE d.device_version_id = dvs.device_version_id
      AND dvs.sensor_id = s.id
      AND d.id = #{id}
   </select>


    <select id="getSensorByMonitorPointId" resultType="java.util.Map">
      SELECT DISTINCT s.sensor_key sensorKey,s.unit,s.name,s.description,s.id
      FROM device d,device_version dv,device_version_sensor dvs,sensor s