From 9d1da9f5e2034645f4836deb95e3d2486cbf6f72 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 04 六月 2020 22:06:43 +0800
Subject: [PATCH] 加入 查询设备
---
java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml | 72 +++++++++++++++++++++++++-----------
1 files changed, 50 insertions(+), 22 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
index c773d0b..7ca9a5a 100644
--- a/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
@@ -6,15 +6,15 @@
<!-- 淇濆瓨璁惧淇℃伅 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,location_type_cd,location_obj_id,state
-) values (
-#{machineMac},#{machineId},#{machineCode},#{authCode},#{operate},#{machineVersion},
-#{communityId},#{bId},#{machineName},#{machineTypeCd},#{machineIp},
-#{locationTypeCd},#{locationObjId},#{state}
-)
- </insert>
+ 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,location_type_cd,location_obj_id,state,direction
+ ) values (
+ #{machineMac},#{machineId},#{machineCode},#{authCode},#{operate},#{machineVersion},
+ #{communityId},#{bId},#{machineName},#{machineTypeCd},#{machineIp},
+ #{locationTypeCd},#{locationObjId},#{state},#{direction}
+ )
+ </insert>
<!-- 鏌ヨ璁惧淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
@@ -23,7 +23,8 @@
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,t.direction
from business_machine t
where 1 =1
<if test="machineMac !=null and machineMac != ''">
@@ -69,6 +70,10 @@
<if test="state !=null and state != ''">
and t.state = #{state}
</if>
+ <if test="direction !=null and direction != ''">
+ and t.direction = #{direction}
+ </if>
+
</select>
@@ -78,11 +83,11 @@
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,
- location_type_cd,location_obj_id,state
+ location_type_cd,location_obj_id,state,direction
) 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.location_type_cd,t.location_obj_id,t.state
+ t.location_type_cd,t.location_obj_id,t.state,t.direction
from business_machine t where 1=1
<if test="machineMac !=null and machineMac != ''">
and t.machine_mac= #{machineMac}
@@ -125,6 +130,9 @@
<if test="state !=null and state != ''">
and t.state = #{state}
</if>
+ <if test="direction !=null and direction != ''">
+ and t.direction = #{direction}
+ </if>
</insert>
@@ -137,8 +145,9 @@
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
- from machine t,t_dict td,t_dict td1,t_dict td2
+ t.location_type_cd,t.location_obj_id,
+ td1.name stateName,t.create_time createTime,t.direction,td3.name directionName
+ from machine t,t_dict td,t_dict td1,t_dict td3
where 1 =1
and t.machine_type_cd=td.status_cd
and td.table_name='machine'
@@ -146,9 +155,9 @@
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'
+ and t.direction = td3.status_cd
+ and td3.table_name='machine'
+ and td3.table_columns='direction'
<if test="machineMac !=null and machineMac != ''">
and t.machine_mac= #{machineMac}
</if>
@@ -188,9 +197,19 @@
<if test="locationObjId !=null and locationObjId != ''">
and t.location_obj_id= #{locationObjId}
</if>
+ <if test="locationObjIds != null ">
+ and t.location_obj_id in
+ <foreach collection="locationObjIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="state !=null and state != ''">
and t.state = #{state}
</if>
+ <if test="direction !=null and direction != ''">
+ and t.direction = #{direction}
+ </if>
+ order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -237,6 +256,9 @@
<if test="state !=null and state != ''">
, t.state = #{state}
</if>
+ <if test="direction !=null and direction != ''">
+ , t.direction = #{direction}
+ </if>
where 1=1
<if test="machineId !=null and machineId != ''">
and t.machine_id= #{machineId}
@@ -250,17 +272,17 @@
<!-- 鏌ヨ璁惧鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryMachinesCount" parameterType="Map" resultType="Map">
select count(1) count
- from machine t,t_dict td,t_dict td1,t_dict td2
+ from machine t,t_dict td,t_dict td1,t_dict td3
where 1 =1
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 td2.table_name='machine'
- and td2.table_columns='location_type_cd'
+ and t.direction = td3.status_cd
+ and td3.table_name='machine'
+ and td3.table_columns='direction'
<if test="machineMac !=null and machineMac != ''">
and t.machine_mac= #{machineMac}
</if>
@@ -300,6 +322,12 @@
<if test="locationObjId !=null and locationObjId != ''">
and t.location_obj_id= #{locationObjId}
</if>
+ <if test="locationObjIds != null ">
+ and t.location_obj_id in
+ <foreach collection="locationObjIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="state !=null and state != ''">
and t.state = #{state}
</if>
--
Gitblit v1.8.0