From 1bd6a5e7678477f5b1fab449c6d618aae9041611 Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Wed, 13 Feb 2019 11:13:19 +0800 Subject: [PATCH] 设备 相关更新 --- src/main/java/com/moral/mapper/DeviceMapper.java | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 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..70c23aa 100644 --- a/src/main/java/com/moral/mapper/DeviceMapper.java +++ b/src/main/java/com/moral/mapper/DeviceMapper.java @@ -1,19 +1,44 @@ package com.moral.mapper; +import java.util.Date; 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; -@Mapper -public interface DeviceMapper extends BaseMapper<Device, DeviceExample, Integer>{ +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); } \ No newline at end of file -- Gitblit v1.8.0