From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +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, 6 insertions(+), 3 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 75ed48e..e3255b8 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
@@ -22,6 +22,7 @@
 import org.springblade.jfpt.equipment.entity.Equipment;
 import org.springblade.jfpt.equipment.vo.EquipmentVO;
 import org.springblade.jfpt.equipment.vo.EquipmentVOS;
+import org.springblade.jfpt.parcel.vo.ConditionVo;
 
 import java.util.List;
 import java.util.Map;
@@ -47,9 +48,11 @@
 	 */
 	List<EquipmentVOS> tree();
 
-	List<EquipmentVO> listAll();
+	List<EquipmentVO> listAll(EquipmentVO equipment);
 
 	void updateOne(Equipment equipment);
+
+	void saveImg(EquipmentVO equipment);
 
 	void s(Equipment equipment);
 
@@ -80,10 +83,10 @@
 
 	/**
 	 * 查询在线设备总数
-	 * @param status 状态码   0：本日   1：本周   2：本月
+	 * @param conditionVo status 状态码   0：本日   1：本周   2：本月
 	 * @return
 	 */
-    Integer selectEquipmentCount(Integer status);
+    Integer selectEquipmentCount(ConditionVo conditionVo);
 	void updateexpireTime(String expireTime, String deviceNumber);
 	void updateExstate(String state,String reason, String deviceNumber);
 

--
Gitblit v1.9.3