From c7d05af4e7ebf92b67308df21bde17282c0c50f1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 May 2021 21:44:06 +0800
Subject: [PATCH] 1.警情导出bug修复 2.警情统计接口修改 3.一键报警设备接收报文时修改设备状态

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 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..22f668a 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;
@@ -36,6 +37,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 +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);
 
@@ -76,8 +83,21 @@
 
 	/**
 	 * 查询在线设备总数
-	 * @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();
 }

--
Gitblit v1.9.3