From 2ab4d484c09bf29d5f63dafb0fec3eda23bc4b4e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 25 Dec 2023 14:17:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java b/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java
index 025f615..7492170 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java
@@ -1,10 +1,12 @@
package com.moral.api.mapper;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.moral.api.entity.Device;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.moral.api.pojo.dto.dataDisplay.HeatMapDTO;
import com.moral.api.pojo.vo.device.AppDeviceVo;
import io.lettuce.core.dynamic.annotation.Param;
@@ -37,4 +39,10 @@
List<AppDeviceVo> getDevices(@Param("mac") String mac,@Param("organizationId") Integer organizationId);
+
+ List<HeatMapDTO> getHeatMap(HashMap<String,Object> params);
+
+
+ List<HeatMapDTO> getHeatMapV1(HashMap<String,Object> params);
+
}
--
Gitblit v1.8.0