From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/mapper/SensorMapper.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/mapper/SensorMapper.java b/src/main/java/com/moral/mapper/SensorMapper.java
index 6fb9682..6c8e581 100644
--- a/src/main/java/com/moral/mapper/SensorMapper.java
+++ b/src/main/java/com/moral/mapper/SensorMapper.java
@@ -1,11 +1,12 @@
package com.moral.mapper;
-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;
+
+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);
@@ -16,10 +17,19 @@
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>> 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);
}
\ No newline at end of file
--
Gitblit v1.8.0