From 91c1c308abec43a67335cdebb574940ed41b09cf Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 05 Aug 2020 16:56:16 +0800
Subject: [PATCH] 修改预测参数,提交到数据库

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

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 2c5be38..78c2ae8 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -3,10 +3,11 @@
 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.common.bean.ResultBean;
 import com.moral.entity.Device;
+import com.moral.entity.DeviceProperty;
 
 public interface DeviceService {
 
@@ -16,7 +17,9 @@
 
 	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);
@@ -36,4 +39,35 @@
 	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);
 }

--
Gitblit v1.8.0