From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/java/com/moral/service/DeviceService.java |   38 +++++++++++++++++++++++++++++++++-----
 1 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index a4501a4..8123b72 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -1,11 +1,13 @@
 package com.moral.service;
 
-import java.util.List;
-import java.util.Map;
 import com.moral.common.bean.PageBean;
 import com.moral.common.bean.PageResult;
-import com.moral.common.bean.ResultBean;
 import com.moral.entity.Device;
+import com.moral.entity.DeviceProperty;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 public interface DeviceService {
 
@@ -15,20 +17,46 @@
 
 	List<Device> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize);
 
-	Device getDeviceByMac(String mac);
+    Device getDeviceByMac(String mac, boolean fromCache);
+
+    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);
 
-    PageBean queryByPageBean(PageBean pageBean);
+	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);
 }

--
Gitblit v1.8.0