Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

 src/main/resources/mapper/DeviceMapper.xml

@@ -332,4 +332,34 @@
         AND d.profession_id = #{professionId}
         </if>
   </select>

   <resultMap id="ResultMap" type="com.moral.entity.Device">
      <id column="id" jdbcType="INTEGER" property="id" />
      <result column="name" jdbcType="VARCHAR" property="name" />
      <result column="address" jdbcType="VARCHAR" property="address" />
      <result column="longitude" jdbcType="DOUBLE" property="longitude" />
      <result column="latitude" jdbcType="DOUBLE" property="latitude" />
      <result column="mac" jdbcType="VARCHAR" property="mac" />
      <result column="operate_user_id" jdbcType="INTEGER" property="operateUserId" />
      <result column="state" jdbcType="CHAR" property="state" />
      <result column="is_delete" jdbcType="CHAR" property="isDelete" />
      <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
      <result column="install_time" jdbcType="TIMESTAMP" property="installTime" />
      <result column="monitor_point_id" jdbcType="INTEGER" property="monitorPointId" />
      <result column="device_version_id" jdbcType="INTEGER" property="deviceVersionId" />
      <result column="profession_id" jdbcType="INTEGER" property="professionId" />
   </resultMap>

   <select id="getDevicesByOrganizationId" resultMap="ResultMap">
      SELECT
         d.* 
      FROM
         device d,
         monitor_point mp 
      WHERE
         d.monitor_point_id = mp.id 
         AND d.is_delete = 0 
         AND mp.is_delete = 0 
         AND mp.organization_id = #{organizationId}
   </select>
</mapper>