From 1babbf1c0b2bc8d27f2874c85369e394b545594a Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Mon, 11 May 2020 11:24:00 +0800 Subject: [PATCH] add轨迹信息显示按秒级显示,update轨迹数据先从history表查询,update报表单位问题 --- src/main/java/com/moral/service/DeviceService.java | 51 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 45 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java index db24cfc..917c31e 100644 --- a/src/main/java/com/moral/service/DeviceService.java +++ b/src/main/java/com/moral/service/DeviceService.java @@ -1,25 +1,64 @@ 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 { 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); } -- Gitblit v1.8.0