From e0d1a9a05fee8ef75ce8f5bd7107be32ec8c8e82 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 20 Mar 2021 08:55:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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 f8a5b7f..f2fd78d 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
@@ -27,6 +27,8 @@
         <result column="province" property="province"/>
         <result column="city" property="city"/>
         <result column="district" property="district"/>
+        <result column="state" property="state"/>
+        <result column="reason" property="reason"/>
     </resultMap>
 
     <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -254,4 +256,12 @@
     update sys_equipment SET heartbeat=#{heartbeat} where deviceNumber=#{deviceNumber}
 </update>
 
+    <update id="updateexpireTime">
+        update sys_equipment SET expireTime=#{expireTime} where deviceNumber=#{deviceNumber}
+    </update>
+
+    <update id="updateExstate">
+        update sys_equipment SET state=#{state},reason=#{reason}  where deviceNumber=#{deviceNumber}
+    </update>
+
 </mapper>

--
Gitblit v1.9.3