From c50e7293cb05a212d9c67828e42cbc82f28d087d Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Thu, 07 Jan 2021 17:24:53 +0800
Subject: [PATCH] 1.netty调整 2.客户列表
---
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
index 49d3591..7c9c933 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
@@ -18,6 +18,9 @@
<result column="wd" property="wd"/>
<result column="addvcd" property="addvcd"/>
<result column="street" property="street"/>
+ <result column="serialNumber" property="serialNumber"/>
+ <result column="stype" property="stype"/>
+ <result column="channelNumber" property="channelNumber"/>
</resultMap>
<resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -52,7 +55,28 @@
<select id="selectEquipmentPage" resultMap="equipmentResultMap">
- select * from sys_equipment where is_deleted = 0
+ select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,ST_ASTEXT (coordinate ) AS coordinate,dtype,
+ parent_id,
+ FORMAT( jd, 6 ) AS jd,
+ FORMAT( wd, 6 ) AS wd,
+ street,
+ addvcd from sys_equipment where 1=1
+ <if test="equipment.deviceName!=null">
+ and deviceName like concat('%',#{equipment.deviceName},'%')
+ </if>
+ <if test="equipment.addvcd!=null">
+ and addvcd=#{equipment.addvcd}
+ </if>
+ <if test="equipment.deviceType!=null">
+ and deviceType like concat('%',#{equipment.deviceType},'%')
+ </if>
+ <if test="equipment.deviceNumber!=null">
+ and deviceNumber IN (${equipment.deviceNumber})
+ </if>
+ <if test="equipment.dtype!=null">
+ and dtype=#{equipment.dtype}
+ </if>
+ and parent_id!=0
</select>
<!--新增-->
@@ -108,6 +132,12 @@
coordinate=POINT(#{jd},#{wd}),parent_id=#{parentId},jd=#{jd},wd=#{wd},addvcd=#{addvnm},street=#{streeName},dtype=#{dtype} where id=#{id}
</update>
+ <update id="updateOnes" parameterType="org.springblade.modules.equipment.entity.Equipment">
+ update sys_equipment SET deviceName=#{deviceName},deviceNumber=#{deviceNumber},deviceType=#{deviceType},
+ ownership=#{ownership},ownerId=#{yname},devicestate=#{devicestate},stime=#{stime},
+ coordinate=POINT(#{jd},#{wd}),parent_id=#{parentId},jd=#{jd},wd=#{wd},addvcd=#{addvnm},street=#{streeName},dtype=#{dtype} where id=#{id}
+</update>
+
<select id="selectInfo" resultMap="deptVOResultMap"
parameterType="org.springblade.modules.equipment.entity.Equipment">
--
Gitblit v1.9.3