From e66b0932eb782c6ec771ffaa9957e6d5d5361286 Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Tue, 07 Aug 2018 12:49:06 +0800 Subject: [PATCH] 增加 年查询 --- src/main/java/com/moral/mapper/DeviceMapper.java | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java index b77c595..3ba6f22 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; @@ -18,13 +19,22 @@ List<Map<String, Object>> getDeviceVersionIdByMonitorPoint(Integer monitorPointId); - List<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId,@Param("devName")String devName); - List<Device> selectByOrgIdAndMpId(@Param("orgId")Integer orgId,@Param("mpId")Integer mpId); + 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); } \ No newline at end of file -- Gitblit v1.8.0