From d70f7cf3cf5afbfa3d9ca396068d9ff4bfe4046f Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 22 Jul 2019 15:21:06 +0800
Subject: [PATCH] app更新

---
 src/main/java/com/moral/service/impl/SensorServiceImpl.java |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 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 7b410e2..fc9b469 100644
--- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -11,6 +11,7 @@
 import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class SensorServiceImpl implements SensorService{
@@ -27,13 +28,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{
@@ -61,4 +70,23 @@
 
         }
     }
+
+    /**
+     * ������������������������������������������
+     * @param organizationId
+     * @return
+     */
+    @Override
+    public List<Sensor> queryByOrgId(Integer organizationId) {
+        return sensorMapper.selectByOrgId(organizationId);
+    }
+    @Override
+	public List<Sensor> getAllSensors() {
+		return sensorMapper.selectAll();
+	}
+	@Override
+	public Map<String, Object> getSensorBySensorKey(String sensorKey) {
+		Map<String, Object> map = sensorMapper.getSensorBySensorKey(sensorKey);
+		return map;
+	}
 }

--
Gitblit v1.8.0