From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

---
 screen-api/src/main/java/com/moral/api/service/ServicesScopeService.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/ServicesScopeService.java b/screen-api/src/main/java/com/moral/api/service/ServicesScopeService.java
index 568b5af..9bb72eb 100644
--- a/screen-api/src/main/java/com/moral/api/service/ServicesScopeService.java
+++ b/screen-api/src/main/java/com/moral/api/service/ServicesScopeService.java
@@ -3,6 +3,9 @@
 import com.moral.api.entity.ServicesScope;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  ���������
@@ -12,5 +15,23 @@
  * @since 2022-01-19
  */
 public interface ServicesScopeService extends IService<ServicesScope> {
+    
+    /**
+      *@Description: ������������id���������������������
+      *@Param: [map]
+      *@return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>> 
+      *@Author: lizijie
+      *@Date: 2022/2/9 14:04
+     **/
+    List<Map<String, Object>> getDateByOrgIdAndCondition(Map map);
+    
+    /**
+      *@Description: ������������
+      *@Param: [serviceScopeId]
+      *@return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>> 
+      *@Author: lizijie
+      *@Date: 2022/3/21 17:23
+     **/
+    List<Map<String, Object>> honeycombDiagram(Integer serviceScopeId,Integer distance,String type,String time,String sensorCode);
 
 }

--
Gitblit v1.8.0