From ef3a45a366ea8451f2581547fa6a3894bd1d672f Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 29 Aug 2019 10:33:35 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/mapper/SensorMapper.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/mapper/SensorMapper.java b/src/main/java/com/moral/mapper/SensorMapper.java
index c7f4ded..f50008a 100644
--- a/src/main/java/com/moral/mapper/SensorMapper.java
+++ b/src/main/java/com/moral/mapper/SensorMapper.java
@@ -2,6 +2,7 @@
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;
@@ -9,12 +10,21 @@
public interface SensorMapper extends BaseMapper<Sensor> {
List<Sensor> selectByVersionId(Integer deviceVersionId);
- List<Sensor> selectByVersionNo(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<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);
}
\ No newline at end of file
--
Gitblit v1.8.0