From 3c0ccc88ffa8a651ec78a611ffe75775222ebf07 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 31 Jan 2024 17:05:56 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 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 589c2e8..0ef8f55 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,17 @@
package com.moral.api.mapper;
+import java.util.HashMap;
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.vo.OnlineRateVo;
+
+import io.lettuce.core.dynamic.annotation.Param;
/**
* <p>
@@ -19,4 +26,32 @@
/*���������������������������*/
List<Map<String, Object>> getTrendChartData(Map<String, Object> params);
+ List<Map<String, Object>> deviceList(@Param("organizationId") int organizationId,
+ @Param("regionCode") int regionCode,
+ @Param("region") String region,
+ @Param("type") String type,
+ @Param("sensorCode") String sensorCode,
+ @Param("times") String times,
+ @Param("endHourlyTime") String endHourlyTime);
+
+ List<Integer> deviceIdList(@Param("organizationId") int organizationId);
+
+ List<Integer> deviceOrgIdList(@Param("organizationId") int organizationId);
+
+ List<String> deviceMacs(@Param("organizationId") int organizationId);
+
+ 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);
+
+ //���������������������
+ Page<OnlineRateVo> getPage(Page page, @Param("organizationId")Integer organizationId);
+
+ //������������������������
+ List<OnlineRateVo> getLists(@Param("organizationId")Integer organizationId,@Param("state")Integer state);
+
}
--
Gitblit v1.8.0