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/service/impl/EquipmentServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java b/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java
index 1b2ccac..b06c103 100644
--- a/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java
+++ b/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java
@@ -47,8 +47,8 @@
private static final String PARENT_ID = "parentId";
@Override
- public IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment) {
- return page.setRecords(baseMapper.selectEquipmentPage(page, equipment));
+ public List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate) {
+ return baseMapper.selectEquipmentPage(deviceName,addvcd,dtype,devicestate);
}
@@ -87,8 +87,18 @@
}
@Override
+ public List<Map<String, Object>> selectInfos(String deviceNumber) {
+ return baseMapper.selectInfos(deviceNumber);
+ }
+
+ @Override
public List<EquipmentVOS> selectList(String deviceType) {
return baseMapper.selectList(deviceType);
}
+ @Override
+ public void updateChannel(String heartbeat, String deviceNumber) {
+ baseMapper.updateChannel(heartbeat, deviceNumber);
+ }
+
}
--
Gitblit v1.9.3