设备，监控点 功能增强

fengxiang

2018-07-04 288d18ea9f93236f179cbd333dc21bebda7c023a

 src/main/resources/mapper/DeviceMapper.xml

@@ -150,7 +150,7 @@
      WHERE
         mp.area_code = #{areaCode} 
         AND d.monitor_point_id = mp.id
      <if test="orgIds != null and orgIds.size &gt; 0">
      <if test="orgIds != null and orgIds.size() > 0">
         AND mp.organization_id IN
         <foreach  collection="orgIds" open="(" separator="," close=")" item="listItem">
            #{listItem}
@@ -171,12 +171,29 @@
      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 test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
         (
         1 > 1
         <if test="orgIds!=null and orgIds.size() > 0">
            or mpt.organization_id in
            <foreach collection="orgIds" item="tempOrgId" open="(" close=")" separator=",">
               #{tempOrgId,jdbcType=INTEGER}
            </foreach>
         </if>
      <if test="devName!=null and ''!=devName">
         and dev.name like CONCAT('%',#{devName},'%')
         )
      </if>
         and dev.is_delete = 0
         <if test="devState!=null">
            and dev.state = #{devState}
         </if>
         <if test="name!=null and ''!=name">
            and
            (
            dev.name like CONCAT('%',#{name},'%')
            or dev.mac like CONCAT('%',#{name},'%')
            or mpt.name like CONCAT('%',#{name},'%')
            )
         </if>
      </where>
   </select>
   <select id="selectByOrgIdAndMpId" resultMap="BaseResultMap">
@@ -185,9 +202,18 @@
      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}
            (
            1 > 1
            <if test="orgIds!=null and orgIds.size() > 0">
               or mpt.organization_id in
               <foreach collection="orgIds" item="tempOrgId" open="(" close=")" separator=",">
                  #{tempOrgId,jdbcType=INTEGER}
               </foreach>
            </if>
            )
         </if>
         and dev.monitor_point_id = #{mpId}
         and dev.is_delete = 0
      </where>
   </select>
   <select id="selectByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
@@ -196,7 +222,15 @@
        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}
            (
            1 > 1
            <if test="orgIds!=null and orgIds.size() > 0">
               or mpt.organization_id in
               <foreach collection="orgIds" item="tempOrgId" open="(" close=")" separator=",">
                  #{tempOrgId,jdbcType=INTEGER}
               </foreach>
            </if>
            )
         </if>
         <![CDATA[
         AND dev.longitude < #{mapBounds.Ge,jdbcType=NUMERIC}
@@ -204,6 +238,7 @@
            AND dev.latitude  < #{mapBounds.Fe,jdbcType=NUMERIC}
            AND dev.latitude  > #{mapBounds.Ke,jdbcType=NUMERIC}
            ]]>
         AND dev.is_delete =0
      </where>
   </select>
   <resultMap id="BaseResultWithOrgIdsMap" type="com.moral.entity.Device" extends="BaseResultMap">
@@ -217,13 +252,15 @@
      select
      dev.*,
      mpt.name as monitor_point_name,
      pro.name as profession_name
      pro.name as profession_name,
      dvn.version as device_version_value
      from device dev
      left join device_version dvn on dev.device_version_id = dvn.id
        left join monitor_point  mpt on dev.monitor_point_id = mpt.id
        left join profession  pro on pro.id = dev.profession_id
      where dev.mac = #{mac,jdbcType=VARCHAR}
      limit 0,1
   </select>

   <select id="getDeviceCountByRegion" resultType="java.lang.Integer">
      SELECT
         COUNT( * ) 
@@ -247,6 +284,52 @@
               <if test="areaCode != null">
               AND mp.area_code = #{areaCode}
               </if>
               <if test="townCode != null">
               AND mp.town_code = #{townCode}
               </if>
               <if test="villageCode != null">
               AND mp.village_code = #{villageCode}
               </if>
         )
         <if test="professionId != null">
         AND d.profession_id = #{professionId}
         </if>
   </select>
   <select id="getDevicesByProfession" resultType="com.moral.entity.Device">
      SELECT
         * 
      FROM
         device d 
      WHERE
         d.is_delete = 0 
         AND d.monitor_point_id IN (
            SELECT
               mp.id 
            FROM
               monitor_point mp 
            WHERE
               mp.is_delete = 0 
               <if test="provinceCode != null">
               AND mp.province_code = #{provinceCode}
               </if>
               <if test="cityCode != null">
               AND mp.city_code = #{cityCode}
               </if>
               <if test="areaCode != null">
               AND mp.area_code = #{areaCode}
               </if>
               <if test="monitorPointId != null">
               AND mp.id = #{monitorPointId}
               </if>
               <if test="townCode != null">
               AND mp.town_code = #{townCode}
               </if>
               <if test="villageCode != null">
               AND mp.village_code = #{villageCode}
               </if>
         )
         <if test="professionId != null">
         AND d.profession_id = #{professionId}
         </if>
   </select>
</mapper>