From 641d383dc93ae1f2b92c2a974cb64fb1f3bdebe9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 05 Sep 2018 14:34:23 +0800
Subject: [PATCH] TimePeriod添加默认构造函数，解决json 反序列化问题。
---
src/main/java/com/moral/mapper/DeviceMapper.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index d6ffa80..3ba6f22 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -19,7 +19,7 @@
List<Map<String, Object>> getDeviceVersionIdByMonitorPoint(Integer monitorPointId);
- List<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId,@Param("devState") String state,@Param("name")String name);
+ List<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId, @Param("orgIds")List<Integer> orgIds,@Param("devState") String state,@Param("name")String name);
/**
*
@@ -27,7 +27,7 @@
* @param mpId
* @return ���������������������
*/
- List<Device> selectByOrgIdAndMpId(@Param("orgId")Integer orgId,@Param("mpId")Integer mpId);
+ 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);
@@ -35,4 +35,6 @@
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