From f19d7d458e175b0e4beb8aec96a541dd3e8ced25 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Sat, 27 Feb 2021 17:41:37 +0800
Subject: [PATCH] 体温监测实体类,控制/服务/数据映射层创建

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
index 65cebd5..dedecfd 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
@@ -17,9 +17,11 @@
 package org.springblade.jfpt.equipment.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.jfpt.alarm.vo.AlarmVO;
 import org.springblade.jfpt.equipment.entity.Equipment;
 import org.springblade.jfpt.equipment.mapper.EquipmentMapper;
 import org.springblade.jfpt.equipment.service.IEquipmentService;
@@ -41,11 +43,15 @@
 	private static final String PARENT_ID = "parentId";
 
 	@Override
-	public List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate) {
-		return baseMapper.selectEquipmentPage(deviceName,addvcd,dtype,devicestate);
+	public IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment,List childList) {
+		return page.setRecords(baseMapper.selectEquipmentPage(page,equipment,childList));
 	}
 
+	@Override
+	public IPage<EquipmentVO> selectPage(IPage<EquipmentVO> page, EquipmentVO equipment,String pid) {
 
+		return page.setRecords(baseMapper.selectEquipmentPage(page,equipment,null));
+	}
 
 	@Override
 	public List<EquipmentVOS> tree() {
@@ -53,6 +59,11 @@
 	}
 
 	@Override
+	public List<EquipmentVO> listAll() {
+		return baseMapper.listAll();
+	}
+
+	@Override
 	public void updateOne(Equipment equipment) {
 		baseMapper.updateOne(equipment);
 	}

--
Gitblit v1.9.3