From f5af2c565dbe38f22763ec17bf3868d58afafb97 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 16 Nov 2020 16:30:39 +0800
Subject: [PATCH] 更改报表导出时间段 由原先的0-23 改为1-第二天零点
---
src/main/java/com/moral/service/DeviceService.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 8123b72..0789f53 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -1,13 +1,14 @@
package com.moral.service;
-import com.moral.common.bean.PageBean;
-import com.moral.common.bean.PageResult;
-import com.moral.entity.Device;
-import com.moral.entity.DeviceProperty;
-
import java.util.Date;
import java.util.List;
import java.util.Map;
+
+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 {
@@ -59,4 +60,34 @@
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