From f28149d8183a62f87fa9c8df9ae589070d83f612 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 24 Dec 2020 13:47:50 +0800
Subject: [PATCH] 波动补偿

---
 src/main/java/com/moral/service/DeviceService.java |   81 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 701d31b..28038d1 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -1,23 +1,96 @@
 package com.moral.service;
 
+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 {
 
 	Map<String, Object> getDeviceStatesByAccount(Map<String, Object> parameters);
 
-	List<Map<String, Object>> getSensorsByDevice(String mac);
-
 	void saveOrUpdateDevice(Device device);
 
 	List<Device> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize);
 
-	Device getDeviceByMac(String mac);
+    Device getDeviceByMac(String mac, boolean fromCache);
 
-    PageBean queryByPageBean(PageBean pageBean);
+    Device getDeviceByMac(String mac);
+
+	List<Device> query(Map<String,Object> map);
+    PageResult query(Integer orgId, String deviceName,Integer pageSize,Integer pageNo);
+
+    PageResult query(Integer orgId, Integer mpId, Integer pageSize, Integer pageNo);
+
+	int countByExample(PageBean pageBean);
+
+	PageBean queryByPageBean(PageBean pageBean);
 
 	void deleteByIds(Integer[] ids);
+
+    void addOrModify(Device device);
+
+	List<Map> countByTimes(Date start, Date end, String format);
+
+	List<Device> getDevicesByMonitorPointId(Integer monitorPointId);
+
+	List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData);
+
+	Device queryById(Integer id);
+
+	List<Device> getDevicesByProfessionId(Map<String, Object> parameters);
+
+	List<Device> getDevicesByOrganizationId(Map<String, Object> parameters);
+
+    Map<String,Long> queryDeviceStateSummary(Integer orgId);
+
+	void saveOrUpdate(Device device, DeviceProperty deviceProperty);
+
+	PageBean getDeviceList(PageBean pageBean);
+
+	void offLinToMaintenance(Map<String, Object> parameters);
+
+	void saveOrUpdate4Mobile(Device device, DeviceProperty deviceProperty);
+
+	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();
+
+	List<Device> getDevicesByAccountId(String id);
+
 }

--
Gitblit v1.8.0