From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/service/DeviceService.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/DeviceService.java b/screen-api/src/main/java/com/moral/api/service/DeviceService.java
index 605b619..b5b3bd8 100644
--- a/screen-api/src/main/java/com/moral/api/service/DeviceService.java
+++ b/screen-api/src/main/java/com/moral/api/service/DeviceService.java
@@ -1,7 +1,11 @@
package com.moral.api.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.moral.api.dto.OnlineRatePageCond;
import com.moral.api.entity.Device;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.moral.api.pojo.vo.device.AppDeviceVo;
+import com.moral.api.vo.OnlineRateVo;
import java.util.List;
import java.util.Map;
@@ -56,13 +60,40 @@
* @param mac
* @return
*/
- List<Device> getFuzzySearch(String mac);
+ List<AppDeviceVo> getFuzzySearch(String mac);
/**
- * ������������������������
+ * ������������������������
* @param id
* @return
*/
List<Device> getOrganizationDevice(Integer id);
+ /**
+ * ���������������
+ * @param onlineRatePageCond
+ * @return
+ */
+ List<OnlineRateVo> getPage(OnlineRatePageCond onlineRatePageCond);
+
+ /**
+ * ���������������������
+ * @param mac
+ * @param startTime
+ * @param endTime
+ * @param type
+ * @return
+ */
+ Map<String,Object> detail(String mac,String startTime,String endTime, String type);
+
+
+ /**
+ * ���������������
+ * @param macs
+ * @return
+ */
+ Map<String,Object> getStart(List<String> macs);
+
+
+ Map<String,Object> detailV1(String mac,String startTime,String endTime, String type);
}
--
Gitblit v1.8.0