From cea9aba8d0e4833bac428d071664cbe84e6180c9 Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Fri, 15 Jun 2018 09:47:49 +0800 Subject: [PATCH] update --- src/main/java/com/moral/mapper/DeviceMapper.java | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java index f4ce1f4..d6ffa80 100644 --- a/src/main/java/com/moral/mapper/DeviceMapper.java +++ b/src/main/java/com/moral/mapper/DeviceMapper.java @@ -1,5 +1,6 @@ package com.moral.mapper; +import java.util.Date; import java.util.List; import java.util.Map; @@ -7,10 +8,31 @@ import com.moral.common.mapper.BaseMapper; import com.moral.entity.Device; +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("devState") String state,@Param("name")String name); + + /** + * + * @param orgId + * @param mpId + * @return ��������������������� + */ + List<Device> selectByOrgIdAndMpId(@Param("orgId")Integer orgId,@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); } \ No newline at end of file -- Gitblit v1.8.0