From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java |   46 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 43 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 7cfbe7d..f5978f2 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
@@ -20,8 +20,10 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.jfpt.alarm.vo.AlarmVO;
 import org.springblade.jfpt.equipment.entity.Equipment;
+import org.springblade.jfpt.equipment.entity.EquipmentPlayInfo;
 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;
@@ -36,6 +38,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,String dxtype);
+
 	/**
 	 * 树形结构
 	 *
@@ -43,9 +49,11 @@
 	 */
 	List<EquipmentVOS> tree();
 
-	List<EquipmentVO> listAll();
+	List<EquipmentVO> listAll(EquipmentVO equipment);
 
 	void updateOne(Equipment equipment);
+
+	void saveImg(EquipmentVO equipment);
 
 	void s(Equipment equipment);
 
@@ -76,8 +84,40 @@
 
 	/**
 	 * 查询在线设备总数
-	 * @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);
+
+	Integer selectEqCz();
+	Integer selectEqCd();
+	List<Map<String, Object>> selectEqCy(String time);
+	Integer selectEqCg();
+
+	/**
+	 * 获取各个设备状态统计数量
+	 * @return
+	 */
+	Map<String,Object> selEqTypeSum();
+
+	/**
+	 * 更新设备状态
+	 */
+	void updateEquipmentDtype();
+
+	/**
+	 * 获取设备视频播放的信息
+	 * @param equipmentPlayInfo 视频播放地址对象，只需包含设备编号，以及视频播放格式即可
+	 * @return
+	 */
+    EquipmentPlayInfo selectEquimentPlayInfo(EquipmentPlayInfo equipmentPlayInfo);
+
+	/**
+	 * 新增或修改设备视频播放的信息
+	 * @param equipmentPlayInfo 视频播放地址对象
+	 * @return
+	 */
+	boolean saveOrUpdateEquipmentPlayInfo(EquipmentPlayInfo equipmentPlayInfo);
 }

--
Gitblit v1.9.3