From 53217a560fecddcf8ff5b7583532f49381b14d80 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 24 Aug 2020 08:38:30 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/mapper/DeviceMapper.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index b77c595..31e2069 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -1,12 +1,14 @@
package com.moral.mapper;
+import java.util.Date;
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 com.moral.entity.DeviceAndWind;
+import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.entity.Example;
public interface DeviceMapper extends BaseMapper<Device>{
@@ -18,13 +20,57 @@
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);
+ 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();
+
+ List<Device> selectDevicesAll(Map<String, Object> params);
+
+ List<DeviceAndWind> getAllDevice();
+
+ List<String> getAllMac();
+
+ Device byMacGetDevice(@Param("mac") String mac);
+
+ DeviceAndWind getDeviceAndWindByMac(@Param("mac") String mac,@Param("time") String time,
+ @Param("table") String table);
+
+ List<DeviceAndWind> byMonitorIdGetDeviceAndWind(@Param("id") int id,@Param("time") String time, @Param("table") String table);
+ DeviceAndWind byMacGetDeviceAndWind(@Param("mac") String mac,@Param("time") String time, @Param("table") String table);
+
+ List<Device> getDeviceListByMonitorPointIds(List<Integer> list);
+
+ Map<String, Object> selectAllFieldByMac(Map<String, Object> params);
+
+ List getDeviceByCode(Map<String, Object> params);
}
\ No newline at end of file
--
Gitblit v1.8.0