From b6ebb7d8e25fa5505494204abbc54da849ca548e Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Mon, 11 Jan 2021 17:14:22 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptManager
---
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
index 50f9de6..044562e 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
@@ -34,14 +34,7 @@
*/
public interface EquipmentMapper extends BaseMapper<Equipment> {
- /**
- * 自定义分页
- *
- * @param page
- * @param equipment
- * @return
- */
- List<EquipmentVO> selectEquipmentPage(IPage page, EquipmentVO equipment);
+ List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate);
void s(Equipment equipment);
void updateOne(Equipment equipment);
@@ -67,4 +60,6 @@
*/
List<EquipmentVOS> selectList(String deviceType);
EquipmentVOS selectInfo(Equipment equipment);
+ List<Map<String, Object>> selectInfos(String deviceNumber);
+ void updateChannel(String heartbeat,String deviceNumber);
}
--
Gitblit v1.9.3