From 7e25fda3cfb8a7fc785cb6261a888671fb146fbe Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 18 Nov 2020 14:13:13 +0800
Subject: [PATCH] 从history获取数据接口更新为从history日表获取
---
src/main/java/com/moral/service/DeviceService.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index ce6b075..0789f53 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -7,6 +7,7 @@
import com.moral.common.bean.PageBean;
import com.moral.common.bean.PageResult;
import com.moral.entity.Device;
+import com.moral.entity.DeviceAndWind;
import com.moral.entity.DeviceProperty;
public interface DeviceService {
@@ -58,4 +59,35 @@
String getLimitDataByDevice(Map<String, Object> parameters);
+ Device getDeviceByLongitudeAsc(String mac);
+
+ List<String> getMacsByOrganizationId(List<Object> organizationIdList);
+
+ //������������������
+ List<Device> getDeviceById1(int id);
+ //������������������
+ List<Device> getDeviceById2(int id);
+ //������������������
+ List<Device> getDeviceById3(int id);
+
+ List<Device> queryDevice(Map<String,Object> map);
+
+ Map<String, Object> getAllFieldByMac(Map<String, Object> parameters);
+
+ List<DeviceAndWind> getAllDevice();
+
+ List<String> getAllMac();
+
+ Device byMacGetDevice(String mac);
+
+ List<DeviceAndWind> byMonitorIdGetDeviceAndWind(String id,String tab);
+ List<DeviceAndWind> byMonitorIdGetDeviceAndWindSpecial(String id,String tab);
+
+ List<Device> getDeviceByCodeAndId(String code,String id);
+
+ String byMacGetOrgId(String mac);
+ //������mac������������������������������������
+ List<Device> getDevice(String macOrName);
+
+ List<Device> getDeviceByCode();
}
--
Gitblit v1.8.0