From a5b6b004f1737bf06aaaeb8d06e40b9702de25e5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 12 Mar 2021 14:18:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java | 6 +++++-
1 files changed, 5 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..aaf6ad2 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);
@@ -45,6 +47,8 @@
*/
List<EquipmentVOS> tree();
+ List<EquipmentVO> listAll();
+
/**
* 懒加载部门列表
* @param parentId
--
Gitblit v1.9.3