From 712a73114593e64ae3126f9bb531d968f3581394 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 30 Jun 2020 10:31:23 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/mapper/DeviceMapper.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index bf67ff6..2aa2714 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -4,10 +4,10 @@
import java.util.List;
import java.util.Map;
-import org.apache.ibatis.annotations.Param;
-
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.Device;
+
+import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.entity.Example;
public interface DeviceMapper extends BaseMapper<Device>{
@@ -19,8 +19,15 @@
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);
@@ -28,4 +35,21 @@
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);
+
+ List<Device> getDeviceById1(@Param("id") int id);
+
+ //������������������
+ List<Device> getDeviceById2(@Param("id") int id);
+
+ List<Device> getDeviceById3(@Param("id") int id);
+
+ List<Integer> getHasWindDirAndWindSpeedDeviceVersion();
}
\ No newline at end of file
--
Gitblit v1.8.0