From 958ddfcec71043b6b800feaac521e7b22bb15e97 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Apr 2021 09:10:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
index 442e7b7..587f6ab 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -30,6 +30,7 @@
<result column="state" property="state"/>
<result column="reason" property="reason"/>
<result column="jtype" property="jtype"/>
+ <result column="manufacturers" property="manufacturers"/>
</resultMap>
<resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -142,7 +143,7 @@
equipment.oneContacts,equipment.onePhone,equipment.oneId,
equipment.twoContacts,equipment.twoPhone,equipment.twoId,
equipment.ThreeContacts,equipment.ThreePhone,equipment.threeId,
- equipment.deptId,
+ equipment.deptId,equipment.manufacturers,
equipment.addvcd,equipment.pay,equipment.expireTime from sys_equipment equipment
left join sys_catalog catalog on catalog.eqid = equipment.deviceNumber
LEFT JOIN (
@@ -181,6 +182,9 @@
<if test="equipment.city!=null">
and city like concat('%',#{equipment.city},'%')
</if>
+ <if test="equipment.manufacturers!=null and equipment.manufacturers!=''">
+ and manufacturers = #{equipment.manufacturers}
+ </if>
<if test="equipment.devicestate!=null">
and devicestate =#{equipment.devicestate}
@@ -210,7 +214,7 @@
<!--新增-->
<insert id="s" parameterType="org.springblade.jfpt.equipment.entity.Equipment">
- INSERT INTO sys_equipment (deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,coordinate,parent_id,jd,wd,addvcd,street,dtype) VALUES (#{deviceName},#{deviceNumber},#{deviceType},#{ownership},#{yname},#{devicestate},#{stime},POINT(#{jd},#{wd}),#{parentId},#{jd},#{wd},#{addvcd},#{streeName},#{dtype})
+ INSERT INTO sys_equipment (deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,coordinate,parent_id,jd,wd,addvcd,street,dtype,manufacturers) VALUES (#{deviceName},#{deviceNumber},#{deviceType},#{ownership},#{yname},#{devicestate},#{stime},POINT(#{jd},#{wd}),#{parentId},#{jd},#{wd},#{addvcd},#{streeName},#{dtype},#{manufacturers})
</insert>
<!--新增-->
@@ -348,8 +352,9 @@
<update id="updateOne" parameterType="org.springblade.jfpt.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}
+ 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},manufacturers=#{manufacturers}
+ where id=#{id}
</update>
<update id="updataType">
@@ -365,7 +370,7 @@
SELECT
dept.deptId,dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
dept.ownerId,dept.devicestate,dept.stime,dept.district,dept.province,dept.city,
- ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,dept.expireTime,dept.heartbeat, dept.state,dept.reason,
+ ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,dept.manufacturers,dept.expireTime,dept.heartbeat, dept.state,dept.reason,
dept.parent_id,dept.jd,dept.wd,dept.street,u.yname,d.addvnm,dept.addvcd,dept.serialNumber,dept.channelNumber,
dept.oneContacts,dept.onePhone,dept.oneId,
dept.twoContacts,dept.twoPhone,dept.twoId,
--
Gitblit v1.9.3