Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-26 53d155ae4b7c4d5d7258c3d15cfff78ec41561f7

 src/main/resources/mapper/DeviceMapper.xml

@@ -21,6 +21,7 @@
     </association>
     <association property="deviceVersion" javaType="com.moral.entity.DeviceVersion">
        <result column="device_version_id" property="id" jdbcType="INTEGER" />
        <result column="device_version_value" property="version" jdbcType="INTEGER" />
        <result column="device_version_name" property="name" jdbcType="VARCHAR" />
     </association>
     <association property="monitorPoint" javaType="com.moral.entity.MonitorPoint">
@@ -81,7 +82,7 @@
     </if>
     )
  </select>
   <select id="getDeviceStatesByAccount" resultType="map">
   <select id="getDeviceStatesByAccount" resultType="java.util.Map">
      SELECT
         COUNT( d.state ) count,
         d.state 
@@ -98,8 +99,7 @@
      </if>
      GROUP BY d.state
   </select>

   <select id="getSensorsByDevice" resultType="map">
   <select id="getSensorsByDevice" resultType="java.util.Map">
      SELECT
         s.`key`,
         s.`name` 
@@ -114,4 +114,92 @@
      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="getDeviceVersionIdByAreaCode" resultType="int">
      SELECT DISTINCT
         d.device_version_id 
      FROM
         monitor_point mp,
         device d 
      WHERE
         mp.area_code = #{areaCode} 
         AND d.monitor_point_id = mp.id
      <if test="orgIds != null and orgIds.size &gt; 0">
         AND mp.organization_id IN
         <foreach  collection="orgIds" open="(" separator="," close=")" item="listItem">
            #{listItem}
         </foreach>
      </if>
   </select>
   <select id="getDeviceMacByMonitorPointAndDeviceVersion" resultType="string">
      SELECT
         mac
      FROM
         device
      WHERE
         monitor_point_id = #{monitorPointId}
         AND device_version_id = #{deviceVersionId}
   </select>
   <select id="selectByOrgIdAndDevName" resultMap="BaseResultMap">
      SELECT dev.*,dve.version as device_version_value from device dev
      left join monitor_point mpt on dev.monitor_point_id = mpt.id
      left join device_version dve on dev.device_version_id = dve.id
      <where>
         <if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
            mpt.organization_id =  #{orgId}
         </if>
      <if test="devName!=null and ''!=devName">
         and dev.name like CONCAT('%',#{devName},'%')
      </if>
      </where>
   </select>
   <select id="selectByOrgIdAndMpId" resultMap="BaseResultMap">
      SELECT dev.*,dve.version as device_version_value from device dev
      left join monitor_point mpt on dev.monitor_point_id = mpt.id
      left join device_version dve on dev.device_version_id = dve.id
      <where>
         <if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
            mpt.organization_id =  #{orgId}
         </if>
         and dev.monitor_point_id = #{mpId}
      </where>
   </select>
   <select id="selectByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
      SELECT dev.*,dve.version as device_version_value from device dev
      left join monitor_point  mpt on dev.monitor_point_id = mpt.id
        left join device_version dve on dev.device_version_id = dve.id
      <where>
         <if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
            mpt.organization_id = #{orgId,jdbcType=VARCHAR}
         </if>
         <![CDATA[
         AND dev.longitude < #{mapBounds.Ge,jdbcType=NUMERIC}
            AND dev.longitude > #{mapBounds.Le,jdbcType=NUMERIC}
            AND dev.latitude  < #{mapBounds.Fe,jdbcType=NUMERIC}
            AND dev.latitude  > #{mapBounds.Ke,jdbcType=NUMERIC}
            ]]>
      </where>
   </select>
   <resultMap id="BaseResultWithOrgIdsMap" type="com.moral.entity.Device" extends="BaseResultMap">
      <collection property="organizationIds" column="id" select="selectOrganizationIds"></collection>
   </resultMap>
   <!-- resultMap引用 -->
   <select id="selectOrganizationIds" resultType="INTEGER">
      call proc_organizationIds_GetByDeviceId(#{id,jdbcType=INTEGER});
   </select>
   <select id="selectWithOrgIdsByMac" parameterType="java.lang.String" resultMap="BaseResultWithOrgIdsMap">
      select
      id,device_version_id,mac,monitor_point_id
      from device
      where mac = #{mac,jdbcType=VARCHAR}
   </select>
</mapper>