From 3c3250c96a13c796aa88f1366b6d278cb95739e5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 13:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/mapper/SensorMapper.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/mapper/SensorMapper.java b/src/main/java/com/moral/mapper/SensorMapper.java
index 94338a4..fa1d9b8 100644
--- a/src/main/java/com/moral/mapper/SensorMapper.java
+++ b/src/main/java/com/moral/mapper/SensorMapper.java
@@ -2,6 +2,22 @@
 
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.Sensor;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 public interface SensorMapper extends BaseMapper<Sensor> {
+    List<Sensor> selectByVersionId(Integer deviceVersionId);
+
+    List<Sensor> selectByVersionNo(Integer deviceVersionNo);
+
+    List<Sensor> selectByVersionNos(@Param("versionNos") List<Integer> versionNos);
+
+    List<Sensor> selectByOrgId(Integer organizationId);
+
+	List<Map<String, Object>> getSensorsByDeviceVersionId(Integer deviceVersionId);
+	
+    List<Sensor> getSensorsByCriteria(Map<String, Object> parameters);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0