From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/service/DeviceService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index ce6b075..917c31e 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -1,13 +1,13 @@
package com.moral.service;
-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.entity.Device;
import com.moral.entity.DeviceProperty;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
public interface DeviceService {
@@ -58,4 +58,7 @@
String getLimitDataByDevice(Map<String, Object> parameters);
+ Device getDeviceByLongitudeAsc(String mac);
+
+ List<String> getMacsByOrganizationId(List<Object> organizationIdList);
}
--
Gitblit v1.8.0