From d4f150414533b95324b2a1c8a81c11d92efb71ec Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 13 Mar 2018 16:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/java/com/moral/service/impl/SensorServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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..727f319 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;
- public PageBean queryByPageBean(PageBean pageBean){
+
+ /**
+ * ������������������������������
+ * @return
+ */
+ @Override
+ public List<Sensor> queryAll(){
+ return sensorMapper.selectByExample(null);
+ }
+ public PageBean<Sensor> 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