From a5b6b004f1737bf06aaaeb8d06e40b9702de25e5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 12 Mar 2021 14:18:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java |    9 +++++++++
 1 files changed, 9 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..7cfbe7d 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,11 @@
 	 */
 	List<EquipmentVOS> selectList(String deviceType);
 	void updateChannel(String heartbeat, String deviceNumber);
+
+	/**
+	 * 查询在线设备总数
+	 * @param status 状态码   0：本日   1：本周   2：本月
+	 * @return
+	 */
+    Integer selectEquipmentCount(Integer status);
 }

--
Gitblit v1.9.3