From d82b68b61c86db91acebce81326731501457d722 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 18 Aug 2020 15:45:46 +0800
Subject: [PATCH] 预测o3_8H计算,实测增加保良值

---
 src/main/java/com/moral/mapper/DeviceMapper.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 90a7ac3..e396c9a 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>{
@@ -51,4 +51,24 @@
 	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);
+
+	List<Device> getDeviceListByMonitorPointIds(List<Integer> list);
+
+	Map<String, Object> selectAllFieldByMac(Map<String, Object> params);
 }
\ No newline at end of file

--
Gitblit v1.8.0