From f34a510629676ebf22d75bde2e89e2fe4a2f56be Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 18:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 0a4948b..4279cc1 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
@@ -17,6 +17,8 @@
package org.springblade.jfpt.equipment.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.equipment.entity.Equipment;
import org.springblade.jfpt.equipment.vo.EquipmentVO;
import org.springblade.jfpt.equipment.vo.EquipmentVOS;
@@ -32,7 +34,7 @@
*/
public interface EquipmentMapper extends BaseMapper<Equipment> {
- List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate);
+ List<EquipmentVO> selectEquipmentPage(IPage page, EquipmentVO equipment,List childList);
void s(Equipment equipment);
void updateOne(Equipment equipment);
@@ -44,6 +46,8 @@
* @return
*/
List<EquipmentVOS> tree();
+
+ List<EquipmentVO> listAll();
/**
* 懒加载部门列表
@@ -62,4 +66,6 @@
EquipmentVOS selectInfo(Equipment equipment);
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);
}
--
Gitblit v1.9.3