From 23e5eaa3ffde198acc8dd4f91f834203cfcb9988 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 28 十一月 2019 00:48:52 +0800
Subject: [PATCH] 优化设备添加时加入位置信息
---
java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
index ccc09e5..97757e5 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,7 +135,8 @@
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,td.name machineTypeCdName
+ machineTypeCd,t.machine_ip,t.machine_ip machineIp,td.name machineTypeCdName,
+ t.state,t.location_type_cd locationTypeCd,t.location_obj_id locationObjId
from machine t,t_dict td
where 1 =1
and t.machine_type_cd=td.status_cd
@@ -146,6 +175,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>
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -182,6 +220,15 @@
</if>
<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 != ''">
@@ -234,6 +281,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