From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/impl/SensorServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 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 a628a6f..c088849 100644
--- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -27,13 +27,21 @@
public List<Sensor> queryAll(){
return sensorMapper.selectByExample(null);
}
- public PageBean queryByPageBean(PageBean pageBean){
+ 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);
+ }
+ @Override
+ public List<Sensor> queryListByVersionId(Integer deviceVersionId){
+ return sensorMapper.selectByVersionId(deviceVersionId);
+ }
+ @Override
+ public List<Sensor> queryListByVersionNo(Integer versionNo){
+ return sensorMapper.selectByVersionNo(versionNo);
}
public void addOrModify(Sensor sensor){
try{
@@ -62,6 +70,15 @@
}
}
+ /**
+ * ������������������������������������������
+ * @param organizationId
+ * @return
+ */
+ @Override
+ public List<Sensor> queryByOrgId(Integer organizationId) {
+ return sensorMapper.selectByOrgId(organizationId);
+ }
@Override
public List<Sensor> getAllSensors() {
return sensorMapper.selectAll();
--
Gitblit v1.8.0