From e9949aa93452fb09afd36c4af23743149dbca6dc Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 30 十一月 2019 10:22:44 +0800
Subject: [PATCH] 优化 查询设备是的sql 错误
---
java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml | 91 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 83 insertions(+), 8 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
index 357b7a6..99020d4 100644
--- a/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
@@ -7,9 +7,12 @@
<!-- 淇濆瓨璁惧淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessMachineInfo" parameterType="Map">
insert into business_machine(
-machine_mac,machine_id,machine_code,auth_code,operate,machine_version,community_id,b_id,machine_name,machine_type_cd,machine_ip
+machine_mac,machine_id,machine_code,auth_code,operate,machine_version,community_id,b_id,
+machine_name,machine_type_cd,machine_ip,location_type_cd,location_obj_id,state
) values (
-#{machineMac},#{machineId},#{machineCode},#{authCode},#{operate},#{machineVersion},#{communityId},#{bId},#{machineName},#{machineTypeCd},#{machineIp}
+#{machineMac},#{machineId},#{machineCode},#{authCode},#{operate},#{machineVersion},
+#{communityId},#{bId},#{machineName},#{machineTypeCd},#{machineIp},
+#{locationTypeCd},#{locationObjId},#{state}
)
</insert>
@@ -19,7 +22,8 @@
select t.machine_mac,t.machine_mac machineMac,t.machine_id,t.machine_id machineId,t.machine_code,t.machine_code
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
+ 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
from business_machine t
where 1 =1
<if test="machineMac !=null and machineMac != ''">
@@ -56,15 +60,29 @@
and t.machine_ip= #{machineIp}
</if>
+ <if test="locationTypeCd !=null and locationTypeCd != ''">
+ and t.location_type_cd= #{locationTypeCd}
+ </if>
+ <if test="locationObjId !=null and locationObjId != ''">
+ and t.location_obj_id= #{locationObjId}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state = #{state}
+ </if>
+
</select>
<!-- 淇濆瓨璁惧淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveMachineInfoInstance" parameterType="Map">
insert into machine(
- machine_mac,machine_id,machine_code,auth_code,machine_version,status_cd,community_id,b_id,machine_name,machine_type_cd,machine_ip
+ machine_mac,machine_id,machine_code,auth_code,machine_version,status_cd,
+ community_id,b_id,machine_name,machine_type_cd,machine_ip,
+ location_type_cd,location_obj_id,state
) select
- t.machine_mac,t.machine_id,t.machine_code,t.auth_code,t.machine_version,'0',t.community_id,t.b_id,t.machine_name,t.machine_type_cd,t.machine_ip
+ t.machine_mac,t.machine_id,t.machine_code,t.auth_code,t.machine_version,'0',t.community_id,t.b_id,
+ t.machine_name,t.machine_type_cd,t.machine_ip,
+ t.location_type_cd,t.location_obj_id,t.state
from business_machine t where 1=1
<if test="machineMac !=null and machineMac != ''">
and t.machine_mac= #{machineMac}
@@ -98,6 +116,16 @@
and t.machine_ip= #{machineIp}
</if>
+ <if test="locationTypeCd !=null and locationTypeCd != ''">
+ and t.location_type_cd= #{locationTypeCd}
+ </if>
+ <if test="locationObjId !=null and locationObjId != ''">
+ and t.location_obj_id= #{locationObjId}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state = #{state}
+ </if>
+
</insert>
@@ -107,9 +135,20 @@
machineCode,t.auth_code,t.auth_code authCode,t.machine_version,t.machine_version
machineVersion,t.status_cd,t.status_cd statusCd,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
- from machine t
+ 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
+ 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>
@@ -142,6 +181,15 @@
</if>
<if test="machineIp !=null and machineIp != ''">
and t.machine_ip= #{machineIp}
+ </if>
+ <if test="locationTypeCd !=null and locationTypeCd != ''">
+ and t.location_type_cd= #{locationTypeCd}
+ </if>
+ <if test="locationObjId !=null and locationObjId != ''">
+ and t.location_obj_id= #{locationObjId}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state = #{state}
</if>
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -180,6 +228,15 @@
<if test="machineIp !=null and machineIp != ''">
, t.machine_ip= #{machineIp}
</if>
+ <if test="locationTypeCd !=null and locationTypeCd != ''">
+ , t.location_type_cd= #{locationTypeCd}
+ </if>
+ <if test="locationObjId !=null and locationObjId != ''">
+ , t.location_obj_id= #{locationObjId}
+ </if>
+ <if test="state !=null and state != ''">
+ , t.state = #{state}
+ </if>
where 1=1
<if test="machineId !=null and machineId != ''">
and t.machine_id= #{machineId}
@@ -193,8 +250,17 @@
<!-- 鏌ヨ璁惧鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryMachinesCount" parameterType="Map" resultType="Map">
select count(1) count
- from machine t
+ 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>
@@ -228,6 +294,15 @@
<if test="machineIp !=null and machineIp != ''">
and t.machine_ip= #{machineIp}
</if>
+ <if test="locationTypeCd !=null and locationTypeCd != ''">
+ and t.location_type_cd= #{locationTypeCd}
+ </if>
+ <if test="locationObjId !=null and locationObjId != ''">
+ and t.location_obj_id= #{locationObjId}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state = #{state}
+ </if>
</select>
--
Gitblit v1.8.0