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/mapper/EquipmentMapper.java | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
index 7d415e2..35d3fe0 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
@@ -18,8 +18,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
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;
@@ -36,10 +38,11 @@
List<EquipmentVO> selectEquipmentPage(IPage page, EquipmentVO equipment,List childList);
- List<EquipmentVO> selectDeptPages(IPage page, EquipmentVO equipment,List childList,String dxtype);
+ List<EquipmentVO> selectDeptPages(IPage page, EquipmentVO equipment,@Param("pid") String pid,String dxtype);
void s(Equipment equipment);
void updateOne(Equipment equipment);
+ void saveImg(EquipmentVO equipment);
void updataType(String arr);
void updataTypeC(String arr);
/**
@@ -49,7 +52,9 @@
*/
List<EquipmentVOS> tree();
- List<EquipmentVO> listAll();
+ List<EquipmentVO> listAll(@Param("equipment") EquipmentVO equipment);
+
+ List<EquipmentVO> listAlls();
/**
* 懒加载部门列表
@@ -69,9 +74,67 @@
List<Map<String, Object>> selectInfos(String deviceNumber);
void updateChannel(String heartbeat, String deviceNumber);
void updateexpireTime(String expireTime, String deviceNumber);
- void updateExstate(String state,String reason, String deviceNumber);
+
+ /**
+ * 修改设备状态 2021-5-6 arsn修改
+ * @param dtype 设备状态
+ * @param reason 原因
+ * @param deviceNumber 设备编号
+ */
+ void updateExstate(String dtype,String reason, String deviceNumber);
Integer selectEqCz();
Integer selectEqCd();
List<Map<String, Object>> selectEqCy(String time);
Integer selectEqCg();
+
+ /**
+ * 当前预警设备数量
+ * @return
+ */
+ Integer selectEqCys();
+
+ /**
+ * 查询所有的设备，不包含故障和警情状态
+ * @return
+ */
+ List<Equipment> selAllEq();
+
+ /**
+ * 批量更新设备状态改为在线
+ * @param equipmentListz 设备信息集合
+ */
+ void updateEqListz(@Param("equipmentListz") List<Long> equipmentListz);
+
+ /**
+ * 批量更新设备状态改为离线
+ * @param equipmentListl 设备信息集合
+ */
+ void updateEqListl(@Param("equipmentListl") List<Long> equipmentListl);
+
+ /**
+ * 查询在线设备数量
+ * @return
+ */
+ Integer selectOnlineEqNum();
+
+ /**
+ * 获取设备视频播放的信息
+ * @param equipmentPlayInfo 视频播放地址对象，只需包含设备编号，以及视频播放格式即可
+ * @return
+ */
+ EquipmentPlayInfo selectEquimentPlayInfo(EquipmentPlayInfo equipmentPlayInfo);
+
+ /**
+ * 新增设备视频播放的信息
+ * @param equipmentPlayInfo 视频播放地址对象
+ * @return
+ */
+ int saveEquipmentPlayInfo(EquipmentPlayInfo equipmentPlayInfo);
+
+ /**
+ * 修改设备视频播放的信息
+ * @param equipmentPlayInfo 视频播放地址对象
+ * @return
+ */
+ int updateEquipmentPlayInfo(EquipmentPlayInfo equipmentPlayInfo);
}
--
Gitblit v1.9.3