优化设备脚本查询

wuxw

2019-12-01 7987c4f005f5bd8739411d08e4e3bfb67e4df9ef

 java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml

@@ -23,7 +23,7 @@
        machineCode,t.auth_code,t.auth_code authCode,t.operate,t.machine_version,t.machine_version
        machineVersion,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.machine_name,t.machine_name
        machineName,t.machine_type_cd,t.machine_type_cd machineTypeCd,t.machine_ip,t.machine_ip machineIp,
        t.location_type_cd,t.location_obj_id,t.state,t.location_type_cd locationTypeCd,t.location_obj_id locationObjId
        t.location_type_cd,t.location_obj_id,t.state,t.location_type_cd,t.location_obj_id,t.location_type_cd locationTypeCd,t.location_obj_id locationObjId
        from business_machine t
        where 1 =1
        <if test="machineMac !=null and machineMac != ''">
@@ -137,7 +137,8 @@
        bId,t.machine_name,t.machine_name machineName,t.machine_type_cd,t.machine_type_cd
        machineTypeCd,t.machine_ip,t.machine_ip machineIp,td.name machineTypeCdName,
        t.state,t.location_type_cd locationTypeCd,t.location_obj_id locationObjId,
        td1.name stateName,t2.name locationTypeName
        t.location_type_cd,t.location_obj_id,
        td1.name stateName,td2.name locationTypeName
        from machine t,t_dict td,t_dict td1,t_dict td2
        where 1 =1
        and t.machine_type_cd=td.status_cd
@@ -255,10 +256,10 @@
        and t.machine_type_cd=td.status_cd
        and td.table_name='machine'
        and td.table_columns='machine_type_cd'
        and td.state = td1.status_cd
        and t.state = td1.status_cd
        and td1.table_name='machine'
        and td1.table_columns='state'
        and td.location_type_cd = td2.status_cd
        and t.location_type_cd = td2.status_cd
        and td2.table_name='machine'
        and td2.table_columns='location_type_cd'
        <if test="machineMac !=null and machineMac != ''">