From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
index 158a589..2cd7414 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
@@ -36,6 +36,10 @@
 
 	IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment,List childList);
 	IPage<EquipmentVO> selectPage(IPage<EquipmentVO> page, EquipmentVO equipment,String pid);
+
+
+	IPage<EquipmentVO> selectDeptPages(IPage<EquipmentVO> page, EquipmentVO equipment,String pid);
+
 	/**
 	 * 树形结构
 	 *
@@ -73,4 +77,13 @@
 	 */
 	List<EquipmentVOS> selectList(String deviceType);
 	void updateChannel(String heartbeat, String deviceNumber);
+
+	/**
+	 * 查询在线设备总数
+	 * @param status 状态码   0：本日   1：本周   2：本月
+	 * @return
+	 */
+    Integer selectEquipmentCount(Integer status);
+	void updateexpireTime(String expireTime, String deviceNumber);
+	void updateExstate(String state,String reason, String deviceNumber);
 }

--
Gitblit v1.9.3