From b4cabe178f1a36433270c79048beecfab0edc487 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 30 Jan 2018 17:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/SensorServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/SensorServiceImpl.java b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
index 32b2d97..a628a6f 100644
--- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -18,9 +18,23 @@
SensorMapper sensorMapper;
private static Class ENTITY_CLASS = Sensor.class;
+
+ /**
+ * ������������������������������
+ * @return
+ */
+ @Override
+ public List<Sensor> queryAll(){
+ return sensorMapper.selectByExample(null);
+ }
public PageBean queryByPageBean(PageBean pageBean){
return MyBatisBaseMapUtil.queryPage(sensorMapper,pageBean,ENTITY_CLASS);
}
+ @Override
+ public PageBean queryByVersionId(Integer deviceVersionId){
+ List<Sensor> sensorList = sensorMapper.selectByVersionId(deviceVersionId);
+ return new PageBean(sensorList);
+ }
public void addOrModify(Sensor sensor){
try{
if(sensor.getId()==null){
--
Gitblit v1.8.0