From a13506f193f38720ae2729f9c2ceb35bf9fdb898 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 28 Sep 2020 11:50:05 +0800
Subject: [PATCH] 更新获取风向和设备信息，添加经纬度，修改rabbit MQ代码。
---
src/main/java/com/moral/mapper/DeviceMapper.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 2d4ae0f..f5f97ac 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -4,11 +4,11 @@
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>{
@@ -42,4 +42,35 @@
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<String> getMacsByMonitorPointIds(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