From 8a4fccc993cbef14b83443d91e51e9b74664eab5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 10 Aug 2020 11:18:46 +0800
Subject: [PATCH] update

---
 src/main/java/com/moral/mapper/DeviceMapper.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 34eff69..99b1786 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -1,14 +1,61 @@
 package com.moral.mapper;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Mapper;
-
+import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.Device;
-import com.moral.entity.DeviceExample;
 
-@Mapper
-public interface DeviceMapper extends BaseMapper<Device, DeviceExample, Integer> {
-	List<Map<String, Object>> getDeviceStates(Map<String, Object> parameters);
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.entity.Example;
+
+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("orgIds")List<Integer> orgIds,@Param("devState") String state,@Param("name")String name);
+
+	/**
+	 *
+	 * @param orgId
+	 * @param mpId
+	 * @return ���������������������
+	 */
+	List<Device> selectByOrgIdAndMpId(@Param("orgId")Integer orgId,@Param("orgIds")List<Integer> orgIds,@Param("mpId")Integer mpId);
+	List<Device> selectByMap(Map<String, Object> params);
+	Device selectWithOrgIdsByMac(String mac);
+	List<Integer> getDeviceVersionIdByAreaCode(Map<String, Object> parameters);
+	Integer getDeviceCountByRegion(Map<String, Object> parameters);
+	List<Map> countByTimes(@Param("start")Date start,@Param("end")Date end,@Param("format")String format);
+
+	List<Device> getDevicesByProfession(Map<String, Object> parameters);
+
+	List<Device> getDevicesByOrganizationId(Map<String, Object> parameters);
+	List<Map<String, Object>> getDevicesStateByRegion(Map<String, Object> parameters);
+
+	List<Device> getDeviceList(Example example);
+	String getLimitDataByDevice(Map<String, Object> parameters);
+
+    List<String> getMacsByOrganizationId(@Param("organizationIdList") List<Object> organizationIdList);
+
+	List<Device> getDeviceById1(@Param("id") int id);
+
+	//������������������
+	List<Device> getDeviceById2(@Param("id") int id);
+
+	List<Device> getDeviceById3(@Param("id") int id);
+
+	List<Integer> getHasWindDirAndWindSpeedDeviceVersion();
+
+	List<Device> selectDevicesAll(Map<String, Object> params);
+
+	List<Device> getDeviceListByMonitorPointIds(List<Integer> list);
+
+	Map<String, Object> selectAllFieldByMac(Map<String, Object> params);
 }
\ No newline at end of file

--
Gitblit v1.8.0