From bf07dc7110da782eeb655371d6d6c11818c1b33f Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 01 Feb 2018 16:43:46 +0800
Subject: [PATCH] 设备模块代码恢复
---
src/main/java/com/moral/mapper/DeviceMapper.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index ee2a7f9..44650c0 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -3,17 +3,19 @@
import java.util.List;
import java.util.Map;
-import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.Device;
-import com.moral.entity.DeviceExample;
+import tk.mybatis.mapper.entity.Example;
-@Mapper
-public interface DeviceMapper extends BaseMapper<Device, DeviceExample, Integer>{
+public interface DeviceMapper extends BaseMapper<Device>{
List<Map<String, Object>> getDeviceStatesByAccount(Map<String, Object> parameters);
-
+ List<Device> selectWithRelationData(Example example);
List<Map<String, Object>> getSensorsByDevice(@Param("mac")String mac);
+ List<String> getDeviceMacByMonitorPointAndDeviceVersion(@Param("monitorPointId")Integer monitorPointId,@Param("deviceVersionId")Integer deviceVersionId);
+
+ List<Map<String, Object>> getDeviceVersionIdByMonitorPoint(Integer monitorPointId);
+ List<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId,@Param("devName")String devName);
}
\ No newline at end of file
--
Gitblit v1.8.0