From 0aea8bd18daaaf91e622fdcfdd81dbb2e1b4860c Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Mon, 21 Oct 2024 09:01:18 +0800
Subject: [PATCH] fix:立行立改责任主体修改提交

---
 screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 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 c25f0a9..459da41 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
@@ -4,9 +4,14 @@
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 com.moral.api.pojo.vo.device.DeviceVO;
+import com.moral.api.vo.OnlineRateVo;
+
 import io.lettuce.core.dynamic.annotation.Param;
 
 /**
@@ -39,6 +44,17 @@
     List<AppDeviceVo> getDevices(@Param("mac") String mac,@Param("organizationId") Integer organizationId);
 
 
-    List<Map<String, Object>> getHeatMap(HashMap<String,Object> params);
+    List<HeatMapDTO> getHeatMap(HashMap<String,Object> params);
+
+
+    List<HeatMapDTO> getHeatMapV1(HashMap<String,Object> params);
+
+    //���������������������
+    Page<OnlineRateVo> getPage(Page page, @Param("organizationId")Integer organizationId);
+
+    //������������������������
+    List<OnlineRateVo> getLists(List<String> macs,@Param("state")Integer state);
+
+    List<DeviceVO> getListVo(Integer monitorPointId);
 
 }

--
Gitblit v1.8.0