From a20310f135ebf1c8ccff2b619f3eff3d704436a0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 08 十二月 2022 13:12:03 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/common/MachineV1ServiceDaoImplMapper.xml | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/MachineV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/MachineV1ServiceDaoImplMapper.xml
index c8aafdb..207d65d 100644
--- a/java110-db/src/main/resources/mapper/common/MachineV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/MachineV1ServiceDaoImplMapper.xml
@@ -1,21 +1,19 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="machineV1ServiceDaoImpl">
-
<!-- 淇濆瓨璁惧淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveMachineInfo" parameterType="Map">
- insert into machine(
-heartbeat_time,machine_code,auth_code,location_type_cd,machine_version,machine_name,machine_mac,
-machine_id,type_id,state,community_id,location_obj_id,machine_type_cd,machine_ip,direction,b_id
-) values (
-#{heartbeatTime},#{machineCode},#{authCode},#{locationTypeCd},#{machineVersion},#{machineName},#{machineMac},
-#{machineId},#{typeId},#{state},#{communityId},#{locationObjId},#{machineTypeCd},#{machineIp},#{direction},#{bId}
-)
+ insert into machine(heartbeat_time, machine_code, auth_code, location_type_cd, machine_version, machine_name,
+ machine_mac,
+ machine_id, type_id, state, community_id, location_obj_id, machine_type_cd, machine_ip,
+ direction, b_id)
+ values (#{heartbeatTime}, #{machineCode}, #{authCode}, #{locationTypeCd}, #{machineVersion}, #{machineName},
+ #{machineMac},
+ #{machineId}, #{typeId}, #{state}, #{communityId}, #{locationObjId}, #{machineTypeCd}, #{machineIp},
+ #{direction}, #{bId})
</insert>
-
<!-- 鏌ヨ璁惧淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
<select id="getMachineInfo" parameterType="Map" resultType="Map">
@@ -80,9 +78,7 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼璁惧淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateMachineInfo" parameterType="Map">
@@ -136,7 +132,6 @@
<if test="machineId !=null and machineId != ''">
and t.machine_id= #{machineId}
</if>
-
</update>
<!-- 鏌ヨ璁惧淇℃伅鏁伴噺 add by wuxw 2018-07-03 -->
@@ -192,8 +187,5 @@
<if test="direction !=null and direction != ''">
and t.direction= #{direction}
</if>
-
-
</select>
-
</mapper>
--
Gitblit v1.8.0