From e34d88ad7d3d950da12f032e6932ba14f868db72 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 21 Aug 2019 10:22:50 +0800
Subject: [PATCH] 修改大屏无人机地图弹窗显示不全问题，设置可拖动
---
src/main/java/com/moral/service/DeviceService.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index afde4ea..8123b72 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -1,10 +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.entity.Device;
+import com.moral.entity.DeviceProperty;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
public interface DeviceService {
@@ -14,15 +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);
- PageBean queryByPageBean(PageBean pageBean);
+ 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