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 | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 7aca03d..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
@@ -34,7 +34,11 @@
*/
public interface IEquipmentService extends IService<Equipment> {
- IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment);
+ 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);
/**
* 树形结构
@@ -42,6 +46,8 @@
* @return
*/
List<EquipmentVOS> tree();
+
+ List<EquipmentVO> listAll();
void updateOne(Equipment equipment);
@@ -71,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