From 3e8e381d224145a676ef932bf2878c6f4b204523 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 19 Aug 2019 08:59:02 +0800
Subject: [PATCH] 修改最大值、最小值按钮和信息保持在同一水平线上及调整起点和终点图标上1显示的位置
---
src/main/java/com/moral/service/DeviceService.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 0cb3198..8123b72 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -1,9 +1,13 @@
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.entity.Device;
public interface DeviceService {
@@ -13,13 +17,46 @@
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);
}
--
Gitblit v1.8.0