From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/mapper/SensorMapper.java b/src/main/java/com/moral/mapper/SensorMapper.java
index c0cd5e8..638ffe6 100644
--- a/src/main/java/com/moral/mapper/SensorMapper.java
+++ b/src/main/java/com/moral/mapper/SensorMapper.java
@@ -1,16 +1,39 @@
 package com.moral.mapper;
 
-import com.moral.common.mapper.BaseMapper;
-import com.moral.entity.Sensor;
-
 import java.util.List;
 import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.moral.common.mapper.BaseMapper;
+import com.moral.entity.Sensor;
 
 public interface SensorMapper extends BaseMapper<Sensor> {
     List<Sensor> selectByVersionId(Integer deviceVersionId);
 
-	List<Map<String, Object>> getSensorsByDeviceVersionId(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(Map<String, Object> parameters);
+
     List<Sensor> getSensorsByCriteria(Map<String, Object> parameters);
 
+    Map<String, Object> getSensorBySensorKey(@Param("sensor_key") String sensor_key);
+
+    List<Map<String, Object>> getSensorByDeviceId(@Param("id") String id);
+
+    List<Map<String, Object>> getSensorByMonitorPointId(@Param("monitor_point_id") String monitor_point_id);
+
+    List<Sensor> getSensorsByMac(Map<String, Object> parameters);
+
+    List<Sensor> getSensorsInfoByMac(@Param("mac") String mac);
+
+    List<Sensor> selectSenosrsByOrgId(Map<String, Object> parameters);
+
+    List<String> getSensorKeys();
+
+    List<Map<String, Object>> getSensorByDId(String id);
 }
\ No newline at end of file

--
Gitblit v1.8.0