From f34a510629676ebf22d75bde2e89e2fe4a2f56be Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 18:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java |   11 +++++++++++
 1 files changed, 11 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 ab589dd..51c7a17 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
@@ -43,6 +43,8 @@
 	 */
 	List<EquipmentVOS> tree();
 
+	List<EquipmentVO> listAll();
+
 	void updateOne(Equipment equipment);
 
 	void s(Equipment equipment);
@@ -71,4 +73,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