组织配置单位和页面布局

fengxiang

2018-06-25 9742e7a70ac6e74d114e68ce1bc8f46670b55453

 src/main/resources/mapper/DeviceMapper.xml

@@ -131,7 +131,7 @@
      ORDER BY
         s.id
   </select>
   <select id="getDeviceVersionIdByMonitorPoint" resultType="map">
   <select id="getDeviceVersionIdByMonitorPoint" resultType="java.util.Map">
      SELECT
         device_version_id deviceVersionId
      FROM
@@ -141,7 +141,7 @@
      GROUP BY
         device_version_id
   </select>
   <select id="getDeviceVersionIdByAreaCode" resultType="int">
   <select id="getDeviceVersionIdByAreaCode" resultType="java.lang.Integer">
      SELECT DISTINCT
         d.device_version_id 
      FROM
@@ -157,7 +157,7 @@
         </foreach>
      </if>
   </select>
   <select id="getDeviceMacByMonitorPointAndDeviceVersion" resultType="string">
   <select id="getDeviceMacByMonitorPointAndDeviceVersion" resultType="java.lang.String">
      SELECT
         mac
      FROM
@@ -171,12 +171,21 @@
      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 test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
         mpt.organization_id =  #{orgId}
      </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">
@@ -188,6 +197,7 @@
            mpt.organization_id =  #{orgId}
         </if>
         and dev.monitor_point_id = #{mpId}
         and dev.is_delete = 0
      </where>
   </select>
   <select id="selectByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
@@ -204,6 +214,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">
@@ -222,6 +233,7 @@
        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">
@@ -247,6 +259,53 @@
               <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>