From d7dd6cbbad5213476bd1e98d65fee6056ad4c2fc Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 06 Apr 2021 14:31:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
index aaf6ad2..7d415e2 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
@@ -36,6 +36,8 @@
 
 	List<EquipmentVO> selectEquipmentPage(IPage page, EquipmentVO equipment,List childList);
 
+	List<EquipmentVO> selectDeptPages(IPage page, EquipmentVO equipment,List childList,String dxtype);
+
 	void s(Equipment equipment);
 	void updateOne(Equipment equipment);
 	void updataType(String arr);
@@ -66,4 +68,10 @@
 	EquipmentVOS selectInfo(Equipment equipment);
 	List<Map<String, Object>> selectInfos(String deviceNumber);
 	void updateChannel(String heartbeat, String deviceNumber);
+	void updateexpireTime(String expireTime, String deviceNumber);
+	void updateExstate(String state,String reason, String deviceNumber);
+	Integer selectEqCz();
+	Integer selectEqCd();
+	List<Map<String, Object>> selectEqCy(String time);
+	Integer selectEqCg();
 }

--
Gitblit v1.9.3