地图搜索功能增强

fengxiang

2018-05-17 43086924a890e1ae64ab98f9b844c3cf8a0b88c8

地图搜索功能增强

 src/main/java/com/moral/mapper/DeviceMapper.java

@@ -19,7 +19,7 @@


    List<Map<String, Object>> getDeviceVersionIdByMonitorPoint(Integer monitorPointId);



    List<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId,@Param("devName")String devName);

    List<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId,@Param("name")String name);



    /**

     *


 src/main/resources/mapper/DeviceMapper.xml

@@ -171,13 +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
            and (
            <![CDATA[
             1 <> 1
            ]]>
            <if test="name!=null and ''!=name">
                or 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">