From 7987c4f005f5bd8739411d08e4e3bfb67e4df9ef Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 01 十二月 2019 13:48:07 +0800
Subject: [PATCH] 优化设备脚本查询
---
java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
index 038b81c..da46d47 100644
--- a/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
+++ b/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,15 +137,19 @@
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
- from machine t,t_dict td,t_dict td1
+ 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
and td.table_name='machine'
and td.table_columns='machine_type_cd'
- and td1.state = td1.status_cd
+ and t.state = td1.status_cd
and td1.table_name='machine'
and td1.table_columns='state'
+ 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 != ''">
and t.machine_mac= #{machineMac}
</if>
@@ -247,11 +251,17 @@
<!-- 鏌ヨ璁惧鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryMachinesCount" parameterType="Map" resultType="Map">
select count(1) count
- from machine t,t_dict td
+ from machine t,t_dict td,t_dict td1,t_dict td2
where 1 =1
and t.machine_type_cd=td.status_cd
and td.table_name='machine'
and td.table_columns='machine_type_cd'
+ and t.state = td1.status_cd
+ and td1.table_name='machine'
+ and td1.table_columns='state'
+ 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 != ''">
and t.machine_mac= #{machineMac}
</if>
--
Gitblit v1.8.0