From d1f1b489eea7730bb1cb78cdae24c626db835298 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 30 Apr 2020 11:24:16 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/mapper/DeviceMapper.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index a9b1064..fdd805e 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -8,6 +8,7 @@
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.Device;
+
import tk.mybatis.mapper.entity.Example;
public interface DeviceMapper extends BaseMapper<Device>{
@@ -19,7 +20,7 @@
List<Map<String, Object>> getDeviceVersionIdByMonitorPoint(Integer monitorPointId);
- List<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId,@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 +28,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 +36,12 @@
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);
}
\ No newline at end of file
--
Gitblit v1.8.0